diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d23891b0..c1845aa8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -47,7 +47,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: alpine.Dockerfile
+          file: Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/ubuntu.Dockerfile b/Dockerfile
similarity index 80%
rename from ubuntu.Dockerfile
rename to Dockerfile
index 8b4c8971..787d0d17 100644
--- a/ubuntu.Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk AS build
+FROM eclipse-temurin:25-jdk AS build
 
 COPY . /build
 WORKDIR /build
@@ -6,7 +6,7 @@ WORKDIR /build
 RUN ./mvnw dependency:copy-dependencies -DoutputDirectory=./target/dependency
 RUN ./mvnw package -DskipTests
 
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:25-jre
 
 ARG MAINTAINER
 ARG REPO_URL=https://github.com/secvisogram/csaf-cms-backend
@@ -22,7 +22,7 @@ RUN apt-get -y update && \
 	rm -rf /var/lib/apt/lists/*
 
 
-COPY  --from=build /build/target/csaf-cms-backend-1.0.0.jar csaf-cms-backend.jar
+COPY  --from=build /build/target/*.jar csaf-cms-backend.jar
 COPY  --from=build /build/target/dependency .
 EXPOSE 8081
 
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
deleted file mode 100644
index 085d9b6c..00000000
--- a/alpine.Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM eclipse-temurin:21-jdk-alpine AS build
-
-COPY . /build
-WORKDIR /build
-
-RUN ./mvnw dependency:copy-dependencies -DoutputDirectory=./target/dependency
-RUN ./mvnw package -DskipTests
-
-FROM eclipse-temurin:21-jre-alpine
-
-ARG MAINTAINER
-ARG REPO_URL=https://github.com/secvisogram/csaf-cms-backend
-LABEL org.opencontainers.image.authors="${MAINTAINER}"
-LABEL org.opencontainers.image.source="${REPO_URL}"
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN apk add --no-cache weasyprint pandoc 
-
-COPY  --from=build /build/target/csaf-cms-backend-1.0.0.jar csaf-cms-backend.jar
-COPY  --from=build /build/target/dependency .
-EXPOSE 8081
-
-ENTRYPOINT ["java", "-jar", "csaf-cms-backend.jar"]