diff --git a/.github/workflows/eumserver_release.yml b/.github/workflows/eumserver_release.yml
index 253d884..0ce26b2 100644
--- a/.github/workflows/eumserver_release.yml
+++ b/.github/workflows/eumserver_release.yml
@@ -32,12 +32,6 @@ jobs:
           run: | 
             cd ./artifacts
             sha256sum * >> inspectit-ocelot-eum-server-sha256-checksums.txt
-        # Uploading eumserver jar, for creating docker image in the next step
-        - name: Upload eumserver jar      
-          uses: actions/upload-artifact@v3
-          with:
-            name: eumserver-jar
-            path: artifacts/inspectit-ocelot-eum-server-${{ github.ref_name }}.jar
         - name: "Build Changelog"
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v3.5.0
@@ -56,38 +50,20 @@ jobs:
             token: ${{ github.token }}
             name: Version ${{ github.ref_name }}
 
-    publish_docker_image:
-      name: "Publish docker image"
+    build_and_publish_docker_images:
+      name: "Build and Push Docker Images"
       runs-on: ubuntu-latest
-      needs: [build_and_release]
+      needs: build_and_release
+      environment: release
       steps:
         - name: Checkout
           uses: actions/checkout@v3
-        - name: Download eumserver jar
-          uses: actions/download-artifact@v3
-          with: 
-            name: eumserver-jar # with the name we are referencing the eumserver-jar uploaded in the build_and_release job
-            path: docker/
-        - name: Check if jar exists and rename it
+        - name: Grant execute permission for gradlew
+          run: chmod +x gradlew
+        - name: Build Docker Images
+          run: ./gradlew dockerTag -PbuildVersion=${{ github.ref_name }}
+        - name: Push Docker Images
           run: |
-            cd docker
-            mv inspectit-ocelot-eum-server-${{ github.ref_name }}.jar inspectit-ocelot-eum-server.jar
-            ls
-        - name: Set up QEMU
-          uses: docker/setup-qemu-action@v2
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v2
-        - name: Login to Docker Hub
-          uses: docker/login-action@v2
-          with:
-            username: ${{ secrets.DOCKER_HUB_USER }}
-            password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v2
-        - name: Build and push image
-          uses: docker/build-push-action@v3
-          with:
-            context: .
-            push: true
-            tags: inspectit/inspectit-ocelot-eum-server:${{ github.ref_name }}, inspectit/inspectit-ocelot-eum-server:latest
-            file: ./docker/Dockerfile
\ No newline at end of file
+            docker login -u ${{ secrets.DOCKER_HUB_USER }} -p  ${{ secrets.DOCKER_HUB_PASSWORD }}
+            docker push inspectit/inspectit-ocelot-eum-server:${{ github.ref_name }}
+            docker push inspectit/inspectit-ocelot-eum-server:latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1506984..1b1b9d2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,6 +6,6 @@ FROM openjdk:11-jre-slim
 # =====
 # In order to build a docker image locally, the eum-server should be build locally and the resulting jar should be renamed
 # to 'inspectit-ocelot-eum-server.jar' and copied to the ./docker directory
-ADD ./docker/ / 
+ADD ./ / 
 ENTRYPOINT ["sh", "/entrypoint.sh"]