diff --git a/.github/workflows/PR-into-2022-2.yml b/.github/workflows/PR-into-2022-2.yml
index a022351..20d8bcb 100644
--- a/.github/workflows/PR-into-2022-2.yml
+++ b/.github/workflows/PR-into-2022-2.yml
@@ -1,11 +1,13 @@
 name: Merge and PR into 2022.2
 run-name: Merge 2021.3 -> 2022.2
-on:
-  pull_request_target:
-    types:
-      - closed
-    branches:
-      - 'mps/2021.3'
+
+# disabled for now, as we do not support MPS 2022.* yet
+#on:
+#  pull_request_target:
+#    types:
+#      - closed
+#    branches:
+#      - 'mps/2021.3'
 
 jobs:
   merge-and-PR-into-2022-2:
diff --git a/.github/workflows/autoTagNewVersion.yml b/.github/workflows/autoTagNewVersion.yml
index 3828a00..fdb40ea 100644
--- a/.github/workflows/autoTagNewVersion.yml
+++ b/.github/workflows/autoTagNewVersion.yml
@@ -6,7 +6,7 @@ on:
     types:
       - closed
     branches:
-      - 'mps/2022.2'
+      - 'mps/2021.3'
 
   # allow manual execution just in case
   workflow_dispatch:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 337a68e..b9bce66 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,8 +6,7 @@ on:
   push:
     branches:
       - 'mps/20**'
-      - 'merge/20**'
-      
+
   # build on new PRs
   pull_request:
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6fdc68f..479e4b8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -5,8 +5,10 @@ on:
   # release on tagging
   push:
     tags:
-      - 'mps/2020.**'
-      - 'mps/2021.**'
+      - '2020.3.**'
+      - '2021.1.**'
+      - '2021.2.**'
+      - '2021.3.**'
 
   # allow manual execution just in case
   workflow_dispatch:
@@ -31,3 +33,16 @@ jobs:
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew assemble publish -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+      - name: Build and Publish MPS+Projector Docker image
+        env:
+          DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+          DOCKER_HUB_KEY: ${{ secrets.DOCKER_HUB_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: cd docker && ./docker-build-projector.sh
\ No newline at end of file
diff --git a/docker/docker-build-projector-mps.sh b/docker/docker-build-projector-mps.sh
deleted file mode 100755
index fdb4ecc..0000000
--- a/docker/docker-build-projector-mps.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# read variables from mps-version.properties
-while IFS='=' read -r key value
-do
-  echo "$key=$value"
-  eval "${key}"=\${value}
-done < "mps-version.properties"
-echo "MPS Version: $mpsVersion"
-echo "MPS Major Version: $mpsMajorVersion"
-echo "MPS Minor Version: $mpsMinorVersion"
-
-modelixVersion=$( ./modelix-version.sh )
-echo "Modelix Version: $modelixVersion"
-
-TIMESTAMP="$(date +"%Y%m%d%H%M")"
-
-(
-  cd ../
-  if [ -d ./projector-server ]; then
-    (
-      cd projector-server
-      git reset --hard
-      git clean -xdf
-      git pull
-    )
-  else
-    git clone https://github.com/modelix/projector-server.git
-  fi
-  (
-    cd projector-server
-    echo "useLocalProjectorClient=true" > local.properties
-  )
-
-  if [ -d ./projector-client ]; then
-    (
-      cd projector-client
-      git reset --hard
-      git clean -xdf
-      git pull
-    )
-  else
-    git clone https://github.com/modelix/projector-client.git
-  fi
-
-  if [ -d ./projector-docker ]; then
-    (
-      cd projector-docker
-      git reset --hard
-      git clean -xdf
-      git pull
-    )
-  else
-    git clone https://github.com/modelix/projector-docker.git
-  fi
-
-  cd projector-docker
-  (
-    cd ../projector-server
-    ./gradlew :projector-server:distZip
-  )
-
-  downloadUrl="https://download.jetbrains.com/mps/${mpsMajorVersion}/MPS-${mpsVersion}.tar.gz"
-
-#  if [ "${CI}" = "true" ]; then
-    docker buildx build --platform linux/amd64,linux/arm64 --push \
-    -t "modelix/projector-mps:${mpsMajorVersion}" \
-    -t "modelix/projector-mps:${mpsVersion}" \
-    --build-arg buildGradle=false --build-arg "downloadUrl=${downloadUrl}" -f Dockerfile ..
-#  else
-#    docker buildx build \
-#    -t "modelix/projector-mps:${mpsMajorVersion}" \
-#    -t "modelix/projector-mps:${mpsVersion}" \
-#    --build-arg buildGradle=false --build-arg "downloadUrl=${downloadUrl}" -f Dockerfile ..
-#  fi
-)
-