diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml
index 7d6164d5..b98ca7fb 100644
--- a/.github/workflows/build_docker_images.yml
+++ b/.github/workflows/build_docker_images.yml
@@ -48,12 +48,12 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: Package
-          path: target/
       -
         name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         with:
+          context: .
           file: ./docker/demo/Dockerfile
           push: true
           tags: bengig/seb-server:latest
diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile
index 59be0ef2..73d9c731 100644
--- a/docker/demo/Dockerfile
+++ b/docker/demo/Dockerfile
@@ -5,9 +5,7 @@ ENV SERVER_PORT="8080"
 ENV JMX_PORT="9090"
 ENV SERVER_PWD=
 
-COPY target/seb-server-auto.jar /sebserver/seb-server-auto.jar
-
-WORKDIR /sebserver
+COPY seb-server-$SEBSERVER_JAR.jar /sebserver/seb-server-$SEBSERVER_JAR.jar
 
 ENTRYPOINT exec java \
     -Dcom.sun.management.jmxremote \