diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index e4e8110d4e..3cd5092013 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     # Only run this workflow for internally triggered events
     if: |
-      github.event.pull_request.head.repo.full_name == github.repository || 
+      github.event.pull_request.head.repo.full_name == github.repository ||
       github.event_name == 'push' ||
       github.event_name == 'workflow_dispatch'
 
@@ -93,7 +93,7 @@ jobs:
             -DnewVersion=${{ steps.vars.outputs.version }} \
             -DgenerateBackupPoms=false \
             -DprocessAllModules=true
-          mvn --batch-mode package
+          ./build.sh
 
       # Build release Docker image and push to Docker Hub
       - name: Push release image to Docker Hub
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 976c3813d3..a3dd7827f4 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -34,8 +34,7 @@ jobs:
     if: |
       github.event_name == 'workflow_dispatch' ||
       github.event_name == 'push' ||
-      (github.event_name == 'pull_request_review' &&
-      github.event.review.state == 'approved')
+      (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -138,9 +137,9 @@ jobs:
     runs-on: ubuntu-latest
     # Only run this workflow for internally triggered events
     if: |
-      github.event.pull_request.head.repo.full_name == github.repository ||
+      github.event_name == 'workflow_dispatch' ||
       github.event_name == 'push' ||
-      github.event_name == 'workflow_dispatch'
+      (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
 
     # Service containers to run with this job. Required for running tests
     services:
@@ -205,7 +204,11 @@ jobs:
           APPSMITH_IS_SELF_HOSTED: false
         working-directory: app/server
         run: |
-            ./build.sh -DskipTests
+          mvn --batch-mode versions:set \
+            -DnewVersion=${{ steps.vars.outputs.version }} \
+            -DgenerateBackupPoms=false \
+            -DprocessAllModules=true
+          ./build.sh -DskipTests
 
       # Upload the build artifact so that it can be used by the test & deploy job in the workflow
       - name: Upload server build bundle
@@ -221,9 +224,9 @@ jobs:
     runs-on: ubuntu-latest
     # Only run this workflow for internally triggered events
     if: |
-      github.event.pull_request.head.repo.full_name == github.repository ||
+      github.event_name == 'workflow_dispatch' ||
       github.event_name == 'push' ||
-      github.event_name == 'workflow_dispatch'
+      (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
 
     steps:
       # Checkout the code
diff --git a/app/server/Dockerfile b/app/server/Dockerfile
index 25bda26541..7612f15218 100644
--- a/app/server/Dockerfile
+++ b/app/server/Dockerfile
@@ -8,8 +8,8 @@ VOLUME /tmp
 
 EXPOSE 8080
 
-ARG JAR_FILE=./appsmith-server/target/server-*.jar
-ARG PLUGIN_JARS=./appsmith-plugins/*/target/*.jar
+ARG JAR_FILE=./dist/server-*.jar
+ARG PLUGIN_JARS=./dist/plugins/*.jar
 ARG APPSMITH_SEGMENT_CE_KEY
 ENV APPSMITH_SEGMENT_CE_KEY=${APPSMITH_SEGMENT_CE_KEY}