diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index f4963d8..49c9891 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -2,9 +2,11 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
 
 jobs:
 
@@ -13,11 +15,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build the Docker image
-      run: docker build . --file ./deployment/Dockerfile --tag arc:$(date +%s)
-    - shell: bash
-      env:
-        SUPER_SECRET: ${{ secrets.SECRET }}
-      run: |
-        echo "$SUPER_SECRET"
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Build JAR
+        run: ./gradlew build
+      - name: Build the Docker image
+        run: docker build . --file ./deployment/Dockerfile --tag arc:$(date +%s)
+      - shell: bash
+        env:
+          SUPER_SECRET: ${{ secrets.SECRET }}
+        run: |
+          echo "$SUPER_SECRET"
\ No newline at end of file
diff --git a/deployment/Dockerfile b/deployment/Dockerfile
index be28e02..091a0ea 100644
--- a/deployment/Dockerfile
+++ b/deployment/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:21-jdk-alpine
 VOLUME /tmp
-COPY *.jar OpenArc.jar
+COPY applications/app-service/build/libs/OpenArc.jar OpenArc.jar
 ENV JAVA_OPTS=" -Xshareclasses:name=cacheapp,cacheDir=/cache,nonfatal -XX:+UseContainerSupport -XX:MaxRAMPercentage=70 -Djava.security.egd=file:/dev/./urandom"
 # Replace with a non-root user to avoid running the container with excessive privileges
 USER appuser
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS  -jar OpenArc.jar" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Dserver.port=${PORT:-8080} -jar OpenArc.jar" ]