diff --git a/.woodpecker/build-docker.yml b/.woodpecker/build-docker.yml
index 5efd546a6..e901a7fd6 100644
--- a/.woodpecker/build-docker.yml
+++ b/.woodpecker/build-docker.yml
@@ -24,7 +24,7 @@ steps:
     secrets: [docker_username, docker_password]
     settings:
       repo: woodpeckerci/woodpecker-agent
-      dockerfile: docker/Dockerfile.agent.multiarch
+      dockerfile: Dockerfile
       platforms: linux/amd64
       tag: next
     when:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c0e2a7e1..dd3f60fa7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,11 @@
-version: "3.7"
-
 services:
   db:
     image: akkoma-db:latest
     build: ./docker-resources/database
     shm_size: 4gb
     restart: unless-stopped
-    user: ${DOCKER_USER}
+    env_file:
+      - .env
     environment: {
       # This might seem insecure but is usually not a problem.
       # You should leave this at the "akkoma" default.
@@ -18,8 +17,6 @@ services:
       POSTGRES_USER: akkoma,
       POSTGRES_PASSWORD: akkoma,
     }
-    env_file:
-      - .env 
     volumes:
       - type: bind
         source: ./pgdata
@@ -27,7 +24,6 @@ services:
 
   akkoma:
     image: akkoma:latest
-    build: .
     restart: unless-stopped
     env_file:
       - .env