diff --git a/apps/_core.yml b/apps/_core.yml
index 4c3af00..c21e982 100644
--- a/apps/_core.yml
+++ b/apps/_core.yml
@@ -33,11 +33,6 @@
   register: path
   ignore_errors: True
 
-- name: Register incomplete Path
-  shell: 'cat /var/plexguide/server.incomplete.path'
-  register: incomplete
-  ignore_errors: True
-
 - name: Register Auth Path
   shell: 'cat /var/plexguide/server.ht'
   register: auth
diff --git a/apps/_plugins.yml b/apps/_plugins.yml
index ba8d435..7e6a747 100644
--- a/apps/_plugins.yml
+++ b/apps/_plugins.yml
@@ -15,7 +15,7 @@
     dest: /opt/appdata
     directory_mode: yes
     force: yes
-    owner: 1000
-    group: 1000
+    owner: '1000'
+    group: '1000'
     mode: 0755
   when: copycheck.stat.exists
diff --git a/apps/airsonic.yml b/apps/airsonic.yml
index 49dab6a..a014171 100644
--- a/apps/airsonic.yml
+++ b/apps/airsonic.yml
@@ -43,8 +43,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/alltube.yml b/apps/alltube.yml
index ab44747..550f5cc 100644
--- a/apps/alltube.yml
+++ b/apps/alltube.yml
@@ -29,8 +29,8 @@
         dest: /opt/appdata/{{pgrole}}/config.json
         force: yes
         mode: 0775
-        owner: 1000
-        group: 1000
+        owner: '1000'
+        group: '1000'
 
     # LABELS ######################################################################
     - name: 'Adding Traefik'
@@ -49,8 +49,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/bazarr.yml b/apps/bazarr.yml
index db0d6af..1fac08d 100644
--- a/apps/bazarr.yml
+++ b/apps/bazarr.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/beets.yml b/apps/beets.yml
index 25cff84..6427030 100644
--- a/apps/beets.yml
+++ b/apps/beets.yml
@@ -48,8 +48,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: ConfCheck
diff --git a/apps/bitwarden.yml b/apps/bitwarden.yml
index 2491874..dd1bd07 100644
--- a/apps/bitwarden.yml
+++ b/apps/bitwarden.yml
@@ -40,8 +40,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/booksonic.yml b/apps/booksonic.yml
index 52f76b1..7866260 100644
--- a/apps/booksonic.yml
+++ b/apps/booksonic.yml
@@ -43,8 +43,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
 
diff --git a/apps/cadvisor.yml b/apps/cadvisor.yml
index 2f7653e..8db8d59 100644
--- a/apps/cadvisor.yml
+++ b/apps/cadvisor.yml
@@ -44,8 +44,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/cloudcmd.yml b/apps/cloudcmd.yml
index a1aac8f..bd301f3 100644
--- a/apps/cloudcmd.yml
+++ b/apps/cloudcmd.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/ddclient.yml b/apps/ddclient.yml
index aa177b8..06fdd62 100644
--- a/apps/ddclient.yml
+++ b/apps/ddclient.yml
@@ -36,8 +36,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          UID: 1000
-          GID: 1000
+          UID: '1000'
+          GID: '1000'
           GIDLIST: '1000'
 
     # MAIN DEPLOYMENT #############################################################
diff --git a/apps/deezloaderremix.yml b/apps/deezloaderremix.yml
index 7f59f37..bfb9be1 100644
--- a/apps/deezloaderremix.yml
+++ b/apps/deezloaderremix.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/deluge.yml b/apps/deluge.yml
index 21bf079..08f8e0d 100644
--- a/apps/deluge.yml
+++ b/apps/deluge.yml
@@ -56,8 +56,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/delugevpn.yml b/apps/delugevpn.yml
index ac79985..7c2c007 100644
--- a/apps/delugevpn.yml
+++ b/apps/delugevpn.yml
@@ -55,8 +55,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
           VPN_ENABLED: yes
           VPN_USER: vpnuser
           VPN_PASS: vpnpass
diff --git a/apps/duplicati.yml b/apps/duplicati.yml
index 35ec664..886b259 100644
--- a/apps/duplicati.yml
+++ b/apps/duplicati.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/embystats.yml b/apps/embystats.yml
index 4bc1b12..567ed11 100644
--- a/apps/embystats.yml
+++ b/apps/embystats.yml
@@ -46,8 +46,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/gazee.yml b/apps/gazee.yml
index e25103f..53c40e9 100644
--- a/apps/gazee.yml
+++ b/apps/gazee.yml
@@ -45,8 +45,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/gitea.yml b/apps/gitea.yml
index 79e1550..15aba27 100644
--- a/apps/gitea.yml
+++ b/apps/gitea.yml
@@ -43,8 +43,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
      #### DB_PASSWORD: gitea
 
     # MAIN DEPLOYMENT #############################################################
diff --git a/apps/handbrake.yml b/apps/handbrake.yml
index 206362f..31dd645 100644
--- a/apps/handbrake.yml
+++ b/apps/handbrake.yml
@@ -48,8 +48,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          USER_ID: 1000
-          GROUP_ID: 1000
+          USER_ID: '1000'
+          GROUP_ID: '1000'
           AUTOMATED_CONVERSION_PRESET: "Very Fast 1080p30"
           AUTOMATED_CONVERSION_FORMAT: "mp4"
           AUTOMATED_CONVERSION_PRESET_2: "HQ 1080p30 Surround"
@@ -63,8 +63,8 @@
       file:
         path: '{{path.stdout}}/handbrake/watch'
         state: directory
-        owner: 1000
-        group: 1000
+        owner: '1000'
+        group: '1000'
         mode: 0755
         recurse: yes
 
@@ -72,8 +72,8 @@
       file:
         path: '{{path.stdout}}/handbrake/complete'
         state: directory
-        owner: 1000
-        group: 1000
+        owner: '1000'
+        group: '1000'
         mode: 0755
         recurse: yes
 
diff --git a/apps/handbrake2.yml b/apps/handbrake2.yml
index 04d555b..ccaeefa 100644
--- a/apps/handbrake2.yml
+++ b/apps/handbrake2.yml
@@ -48,8 +48,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          USER_ID: 1000
-          GROUP_ID: 1000
+          USER_ID: '1000'
+          GROUP_ID: '1000'
           AUTOMATED_CONVERSION_PRESET: "Very Fast 1080p30"
           AUTOMATED_CONVERSION_FORMAT: "mp4"
           AUTOMATED_CONVERSION_PRESET_2: "HQ 1080p30 Surround"
@@ -63,8 +63,8 @@
       file:
         path: '{{path.stdout}}/handbrake/watch'
         state: directory
-        owner: 1000
-        group: 1000
+        owner: '1000'
+        group: '1000'
         mode: 0755
         recurse: yes
 
@@ -72,8 +72,8 @@
       file:
         path: '{{path.stdout}}/handbrake/complete'
         state: directory
-        owner: 1000
-        group: 1000
+        owner: '1000'
+        group: '1000'
         mode: 0755
         recurse: yes
 
diff --git a/apps/headphones.yml b/apps/headphones.yml
index 44bae46..a8804fc 100644
--- a/apps/headphones.yml
+++ b/apps/headphones.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/heimdall.yml b/apps/heimdall.yml
index 09a3204..412a1c2 100644
--- a/apps/heimdall.yml
+++ b/apps/heimdall.yml
@@ -42,8 +42,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/home-assistant.yml b/apps/home-assistant.yml
index 22f12db..0d7dd3b 100644
--- a/apps/home-assistant.yml
+++ b/apps/home-assistant.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/htpcmanager.yml b/apps/htpcmanager.yml
index 5bf3a74..70ad6dd 100644
--- a/apps/htpcmanager.yml
+++ b/apps/htpcmanager.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/jd2-openvpn.yml b/apps/jd2-openvpn.yml
index 6ffacda..5af7044 100644
--- a/apps/jd2-openvpn.yml
+++ b/apps/jd2-openvpn.yml
@@ -60,8 +60,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          UID: 1000
-          GID: 1000
+          UID: '1000'
+          GID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/jdownloader2.yml b/apps/jdownloader2.yml
index c8af712..7bbae15 100644
--- a/apps/jdownloader2.yml
+++ b/apps/jdownloader2.yml
@@ -59,8 +59,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          UID: 1000
-          GID: 1000
+          UID: '1000'
+          GID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/kitana.yml b/apps/kitana.yml
index 9a396d9..1e349c7 100644
--- a/apps/kitana.yml
+++ b/apps/kitana.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/logarr.yml b/apps/logarr.yml
index f8c034b..b0d7f29 100644
--- a/apps/logarr.yml
+++ b/apps/logarr.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/makemkv.yml b/apps/makemkv.yml
index bec50a0..c768211 100644
--- a/apps/makemkv.yml
+++ b/apps/makemkv.yml
@@ -45,8 +45,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          UID: 1000
-          GID: 1000
+          UID: '1000'
+          GID: '1000'
           MAKEMKV_KEY: BETA
           AUTO_DISC_RIPPER: 0
           ENABLE_CJK_FONT: 1
diff --git a/apps/mcmyadmin.yml b/apps/mcmyadmin.yml
index 35f453c..ce1ecca 100644
--- a/apps/mcmyadmin.yml
+++ b/apps/mcmyadmin.yml
@@ -45,8 +45,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/medusa.yml b/apps/medusa.yml
index d5c9e89..5569455 100644
--- a/apps/medusa.yml
+++ b/apps/medusa.yml
@@ -46,8 +46,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/mellow.yml b/apps/mellow.yml
index a792539..f08cd72 100644
--- a/apps/mellow.yml
+++ b/apps/mellow.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/mkvtoolnix.yml b/apps/mkvtoolnix.yml
index f251ad7..0c2bb30 100644
--- a/apps/mkvtoolnix.yml
+++ b/apps/mkvtoolnix.yml
@@ -55,8 +55,8 @@
     - name: 'Setting default ENV'
       set_fact:
         pg_env:
-          USER_ID: 1000
-          GROUP_ID: 1000
+          USER_ID: '1000'
+          GROUP_ID: '1000'
 #          SECURE_CONNECTION: 1
 
     # MAIN DEPLOYMENT #############################################################
diff --git a/apps/monitorr.yml b/apps/monitorr.yml
index 4de5751..56dc800 100644
--- a/apps/monitorr.yml
+++ b/apps/monitorr.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/muximux.yml b/apps/muximux.yml
index 93a30ca..ceffacc 100644
--- a/apps/muximux.yml
+++ b/apps/muximux.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/mylar.yml b/apps/mylar.yml
index 42ef01e..dacd214 100644
--- a/apps/mylar.yml
+++ b/apps/mylar.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/nextcloud.yml b/apps/nextcloud.yml
index 9835aae..1b23a12 100644
--- a/apps/nextcloud.yml
+++ b/apps/nextcloud.yml
@@ -44,8 +44,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     - name: Create and start nextcloud container
       docker_container:
@@ -55,8 +55,8 @@
         published_ports:
           - '127.0.0.0.1:4645:443'
         env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
         volumes: '{{pg_volumes}}'
         networks:
           - name: plexguide
diff --git a/apps/nowshowing.yml b/apps/nowshowing.yml
index e08a63e..4f63f74 100644
--- a/apps/nowshowing.yml
+++ b/apps/nowshowing.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/organizr.yml b/apps/organizr.yml
index e4673f8..47563ff 100644
--- a/apps/organizr.yml
+++ b/apps/organizr.yml
@@ -39,8 +39,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/pyload.yml b/apps/pyload.yml
index 2f9a9c5..4a65137 100644
--- a/apps/pyload.yml
+++ b/apps/pyload.yml
@@ -44,8 +44,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/radarr4k.yml b/apps/radarr4k.yml
index 9995ea0..0afb988 100644
--- a/apps/radarr4k.yml
+++ b/apps/radarr4k.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/radarrhdr.yml b/apps/radarrhdr.yml
index efea277..214f6ea 100644
--- a/apps/radarrhdr.yml
+++ b/apps/radarrhdr.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/resilio.yml b/apps/resilio.yml
index 17e9d42..ff4b576 100644
--- a/apps/resilio.yml
+++ b/apps/resilio.yml
@@ -60,8 +60,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploy {{pgrole}} Container - OverRide'
diff --git a/apps/sharesite.yml b/apps/sharesite.yml
index c3da0d9..af4f066 100644
--- a/apps/sharesite.yml
+++ b/apps/sharesite.yml
@@ -54,8 +54,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
 
diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml
index e2b1699..acb0e40 100644
--- a/apps/sonarr4k.yml
+++ b/apps/sonarr4k.yml
@@ -42,8 +42,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/sonarrhdr.yml b/apps/sonarrhdr.yml
index b36fd81..04e59fe 100644
--- a/apps/sonarrhdr.yml
+++ b/apps/sonarrhdr.yml
@@ -42,8 +42,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN SCRIPT ##############################################################
 
diff --git a/apps/speedtest.yml b/apps/speedtest.yml
index 378a895..dc516a0 100644
--- a/apps/speedtest.yml
+++ b/apps/speedtest.yml
@@ -38,8 +38,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/synclounge.yml b/apps/synclounge.yml
index c450d36..2aa5d17 100644
--- a/apps/synclounge.yml
+++ b/apps/synclounge.yml
@@ -46,8 +46,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          UID: 1000
-          GID: 1000
+          UID: '1000'
+          GID: '1000'
           DOMAIN: {{pgrole}}.{{domain.stdout}}
 
     # MAIN DEPLOYMENT #############################################################
diff --git a/apps/syncthing.yml b/apps/syncthing.yml
index 43683fb..5ce7764 100644
--- a/apps/syncthing.yml
+++ b/apps/syncthing.yml
@@ -53,8 +53,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: xmlcheck
diff --git a/apps/templates/broken/nzbthrottle.yml b/apps/templates/broken/nzbthrottle.yml
index a403b16..861ac01 100644
--- a/apps/templates/broken/nzbthrottle.yml
+++ b/apps/templates/broken/nzbthrottle.yml
@@ -32,8 +32,8 @@
         dest: '/opt/appdata/{{pgrole}}/{{pgrole}}/config.json'
         directory_mode: yes
         force: yes
-        owner: 1000
-        group: 1000
+        owner: '1000'
+        group: '1000'
         mode: 0755
       when: not jsoncheck.stat.exists
 
@@ -56,8 +56,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/thelounge.yml b/apps/thelounge.yml
index 7fc3daf..898d53e 100644
--- a/apps/thelounge.yml
+++ b/apps/thelounge.yml
@@ -40,8 +40,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/ubooquity.yml b/apps/ubooquity.yml
index 4afd838..7151b91 100644
--- a/apps/ubooquity.yml
+++ b/apps/ubooquity.yml
@@ -41,8 +41,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################
     - name: 'Deploying {{pgrole}}'
diff --git a/apps/xteve.yml b/apps/xteve.yml
index 07a5bec..90aa350 100644
--- a/apps/xteve.yml
+++ b/apps/xteve.yml
@@ -44,8 +44,8 @@
     - name: 'Setting PG ENV'
       set_fact:
         pg_env:
-          PUID: 1000
-          PGID: 1000
+          PUID: '1000'
+          PGID: '1000'
 
     # MAIN DEPLOYMENT #############################################################