diff --git a/server-app/.gitea/workflows/build-deploy.yaml b/.gitea/workflows/build-deploy.yaml
similarity index 100%
rename from server-app/.gitea/workflows/build-deploy.yaml
rename to .gitea/workflows/build-deploy.yaml
diff --git a/server-app/Dockerfile b/Dockerfile
similarity index 77%
rename from server-app/Dockerfile
rename to Dockerfile
index f380661..e82a732 100644
--- a/server-app/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,14 @@ RUN git clone -b feature/Produkte --single-branch https://bitbucket.org/omds/omd
   && cd /tmp/lib/OMDSServiceDefinition \
   && mvn clean install -DskipTests
 
-COPY src ./src
-COPY . .
+COPY server-app/src ./src
+COPY server-app .
 
 RUN mvn clean package -DskipTests
 
 FROM eclipse-temurin:21-jre-alpine
 WORKDIR /productdefinitions
-COPY --from=build /productdefinitions/target/*.jar productdefinitions.jar
+COPY --from=build /productdefinitions/server-app/target/*.jar productdefinitions.jar
 
 EXPOSE 9080
 ENTRYPOINT ["java", "-jar", "productdefinitions.jar"]
diff --git a/server-app/docker-compose.yaml b/docker-compose.yaml
similarity index 79%
rename from server-app/docker-compose.yaml
rename to docker-compose.yaml
index 39a637d..4f95a64 100644
--- a/server-app/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 services:
   productdefinitions-service:
     build:
-      context: .
+      context: server-app
       dockerfile: Dockerfile
     container_name: productdefinitions_development_container
     ports: