diff --git a/.dev/docker-compose.mysql.yml b/.dev/docker-compose.mysql.yml
index d4ffe692..ac4384bb 100644
--- a/.dev/docker-compose.mysql.yml
+++ b/.dev/docker-compose.mysql.yml
@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: .
-      dockerfile: php/Dockerfile
+      context: ./php
+      dockerfile: Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -41,13 +41,13 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: .
-      dockerfile: adminer/Dockerfile
+      context: ./adminer
+      dockerfile: Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya
     ports:
-      - '8089:8080'
+      - '8080:8080'
     networks:
       - invoiceshelf-dev
 
diff --git a/.dev/docker-compose.pgsql.yml b/.dev/docker-compose.pgsql.yml
index 8799c493..e514df73 100644
--- a/.dev/docker-compose.pgsql.yml
+++ b/.dev/docker-compose.pgsql.yml
@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: .
-      dockerfile: php/Dockerfile
+      context: ./php
+      dockerfile: Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -40,13 +40,13 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: .
-      dockerfile: adminer/Dockerfile
+      context: ./adminer
+      dockerfile: Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya
     ports:
-      - '54320:8080'
+      - '8080:8080'
     networks:
       - invoiceshelf-dev
 
diff --git a/.dev/docker-compose.sqlite.yml b/.dev/docker-compose.sqlite.yml
index 568a0a11..4405f3dd 100644
--- a/.dev/docker-compose.sqlite.yml
+++ b/.dev/docker-compose.sqlite.yml
@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: .
-      dockerfile: php/Dockerfile
+      context: ./php
+      dockerfile: Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -26,8 +26,8 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: .
-      dockerfile: adminer/Dockerfile
+      context: ./adminer
+      dockerfile: Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya
diff --git a/.dev/php/Dockerfile b/.dev/php/Dockerfile
index 5b945b76..ec4a7a3a 100644
--- a/.dev/php/Dockerfile
+++ b/.dev/php/Dockerfile
@@ -55,12 +55,10 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 WORKDIR /home/invoiceshelf/app
 
 # Copy Files
-COPY /php/entrypoint.sh /
+COPY entrypoint.sh /entrypoint.sh
 
 # Entrypoint
-USER invoiceshelf
 ENTRYPOINT ["/entrypoint.sh"]
 
 # Launch php-fpm
-USER root
 CMD ["php-fpm"]