diff --git a/phpipam.yaml b/phpipam.yaml
index b517fc7..5f95236 100755
--- a/phpipam.yaml
+++ b/phpipam.yaml
@@ -11,14 +11,10 @@ services:
       - "8094:80"
     environment:
       - TZ=America/Chicago
-      - PGID=998
-      - PUID=1001
       - IPAM_DATABASE_HOST=phpipam-mariadb
       - IPAM_DATABASE_PASS=ipam
-
     volumes:
       - /DockerVol/phpipam/phpipam-logo:/phpipam/css/images/logo
-    user: "1001:998"
     deploy:
       labels:
         - diun.enable=true
@@ -44,14 +40,11 @@ services:
       - netgrimoire
     environment:
       - TZ=America/Chicago
-      - PGID=998
-      - PUID=1001
       - IPAM_DATABASE_HOST=phpipam-mariadb
       - IPAM_DATABASE_PASS=ipam
       - SCAN_INTERVAL=1h
     volumes:
       - /DockerVol/phpipam/phpipam-logo:/phpipam/css/images/logo
-    user: "1001:998"
     deploy:
       labels:
         - diun.enable=true
@@ -62,18 +55,17 @@ services:
       restart_policy:
         condition: any
 
-  mysql:
+  phpipam-mariadb:
     image: mariadb:latest
+    container_name: phpipam-mariadb
+    hostname: phpipam-mariadb
     networks:
       - netgrimoire
     volumes:
       - /DockerVol/phpipam/mariadb:/var/lib/mysql
     environment:
       - TZ=America/Chicago
-      - PGID=998
-      - PUID=1001
       - MYSQL_ROOT_PASSWORD=ipam
-    user: "1001:998"
     deploy:
       labels:
         - diun.enable=true