diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 22812cd8..0cb0f840 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -58,3 +58,13 @@ jobs:
         push: true
         tags: |
           ghcr.io/openconext/openconext-pdp/pdp-gui:${{ github.ref_name }}
+
+    - name: Build and push the pdp server image
+      uses: docker/build-push-action@v4
+      with:
+        context: pdp-server
+        file: pdp-server/docker/Dockerfile
+        platforms: linux/amd64
+        push: true
+        tags: |
+          ghcr.io/openconext/openconext-pdp/pdp-server:${{ github.ref_name }}
diff --git a/pdp-server/docker/Dockerfile b/pdp-server/docker/Dockerfile
new file mode 100644
index 00000000..c9a98d44
--- /dev/null
+++ b/pdp-server/docker/Dockerfile
@@ -0,0 +1,3 @@
+FROM eclipse-temurin:17-jdk-alpine
+COPY target/*.jar app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]