diff --git a/.github/workflows/gretl.yml b/.github/workflows/gretl.yml
index 143a79af..f305a45e 100644
--- a/.github/workflows/gretl.yml
+++ b/.github/workflows/gretl.yml
@@ -36,29 +36,29 @@ jobs:
         run: ./gradlew clean gretl:classes 
 
       - name: Unit Tests and publish plugin to local maven repo
-        # run: |
-        #   TZ="Europe/Zurich" ./gradlew gretl:test gretl:dbTest
-        #   ./gradlew clean gretl:s3Test -Ds3AccessKey=$S3_ACCESS_KEY -Ds3SecretKey=$S3_SECRET_KEY -Ds3BucketName=ch.so.agi.gretl.test
-        #   ./gradlew gretl:build gretl:publishPluginMavenPublicationToMavenLocal -x test
         run: |
+          TZ="Europe/Zurich" ./gradlew gretl:test gretl:dbTest
+          ./gradlew clean gretl:s3Test -Ds3AccessKey=$S3_ACCESS_KEY -Ds3SecretKey=$S3_SECRET_KEY -Ds3BucketName=ch.so.agi.gretl.test
           ./gradlew gretl:build gretl:publishPluginMavenPublicationToMavenLocal -x test
+        # run: |
+        #   ./gradlew gretl:build gretl:publishPluginMavenPublicationToMavenLocal -x test
         env:
           S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
           S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
 
-      # - name: Integration Test (Jar)
-      #   run: |
-      #     TZ="Europe/Zurich" ./gradlew gretl:jarTest
-      #     ./gradlew gretl:jarS3Test -Ds3AccessKey=$S3_ACCESS_KEY -Ds3SecretKey=$S3_SECRET_KEY -Ds3BucketName=ch.so.agi.gretl.test
-      #   env:
-      #     S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
-      #     S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+      - name: Integration Test (Jar)
+        run: |
+          TZ="Europe/Zurich" ./gradlew gretl:jarTest
+          ./gradlew gretl:jarS3Test -Ds3AccessKey=$S3_ACCESS_KEY -Ds3SecretKey=$S3_SECRET_KEY -Ds3BucketName=ch.so.agi.gretl.test
+        env:
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
 
-      # - uses: actions/upload-artifact@v2
-      #   if: ${{ failure() }}
-      #   with:
-      #     name: reports-jar
-      #     path: gretl/build/reports/tests/
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: reports-jar
+          path: gretl/build/reports/tests/
 
       - name: Stage jar files
         run: |
@@ -112,21 +112,22 @@ jobs:
         run: |
           docker images
 
-      # - name: Integration Test (Docker Image)
-      #   run: |
-      #     TZ="Europe/Zurich" ./gradlew gretl:imageTest 
-      #     ./gradlew gretl:imageS3Test -Ds3AccessKey=$S3_ACCESS_KEY -Ds3SecretKey=$S3_SECRET_KEY -Ds3BucketName=ch.so.agi.gretl.test
-      #   env:
-      #     S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
-      #     S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+      - name: Integration Test (Docker Image)
+        run: |
+          TZ="Europe/Zurich" ./gradlew gretl:imageTest 
+          ./gradlew gretl:imageS3Test -Ds3AccessKey=$S3_ACCESS_KEY -Ds3SecretKey=$S3_SECRET_KEY -Ds3BucketName=ch.so.agi.gretl.test
+        env:
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       
-      # - uses: actions/upload-artifact@v2
-      #   if: ${{ failure() }}
-      #   with:
-      #     name: reports-docker
-      #     path: |
-      #       gretl/build/reports/tests/
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: reports-docker
+          path: |
+            gretl/build/reports/tests/
 
+      # 2.2-Branch nicht (mehr) in Plugins-Repo releasen.
       # - name: Publish plugin
       #   run: ./gradlew gretl:publishPlugins -s
       #   if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') && !env.ACT }}
@@ -134,13 +135,13 @@ jobs:
       #     gradlePublishKey: ${{ secrets.GRADLEPUBLISHKEY }}
       #     gradlePublishSecret: ${{ secrets.GRADLEPUBLISHSECRET }}
 
-      # - name: Multi-platform build 
-      #   uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229  # v2.7.0 (2021-10-22)
-      #   with:
-      #     platforms: linux/amd64,linux/arm64
-      #     context: ./runtimeImage/gretl
-      #     file: ./runtimeImage/gretl/Dockerfile
-      #     tags: ${{ steps.meta.outputs.tags }}
-      #     labels: ${{ steps.meta.outputs.labels }}
-      #     pull: true
-      #     push: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/V2_2_x') && (github.event_name != 'pull_request') && !env.ACT }}
+      - name: Multi-platform build 
+        uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229  # v2.7.0 (2021-10-22)
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: ./runtimeImage/gretl
+          file: ./runtimeImage/gretl/Dockerfile
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          pull: true
+          push: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/V2_2_x') && (github.event_name != 'pull_request') && !env.ACT }}