diff --git a/base/hostconfig/adm01.sls b/base/hostconfig/adm01.sls
index 9946999..1e6976b 100644
--- a/base/hostconfig/adm01.sls
+++ b/base/hostconfig/adm01.sls
@@ -13,8 +13,8 @@ systemd:
         After: network-online.target local-fs.target podman.socket
         Before: haproxy.service
       Service:
-        ExecStart: /usr/bin/podman start -a dr-mirror
-        ExecStop: /usr/bin/podman stop dr-mirror
+        ExecStart: /usr/bin/podman start container-docker-mirror
+        ExecStop: /usr/bin/podman stop container-docker-mirror
       Install:
         WantedBy: multi-user.target
     container-container-registry:
@@ -32,6 +32,11 @@ systemd:
         Description: Container Registry garbage collect
       Service:
         ExecStart: /usr/bin/podman exec container-registry /bin/registry garbage-collect /etc/docker/registry/config.yml -m
+    container-docker-mirror-garbage-collect:
+      Unit:
+        Description: Container Docker mirror garbage collect
+      Service:
+        ExecStart: /usr/bin/podman exec container-docker-mirror /bin/registry garbage-collect /etc/docker/registry/config.yml -m
   timer:
     container-registry-garbage-collect:
       Unit:
@@ -41,6 +46,14 @@ systemd:
         Persistent: true
       Install:
         WantedBy: timers.target
+    container-docker-mirror-garbage-collect:
+      Unit:
+        Description: Timer for docker-mirror-garbage-collect
+      Timer:
+        OnCalendar: weekly
+        Persistent: true
+      Install:
+        WantedBy: timers.target
 haproxy:
   enabled: True
   overwrite: True
@@ -140,7 +153,7 @@ haproxy:
         server1:
           name: adm01
           host: 127.0.0.1
-          port: 5500
+          port: 5001
           check: check
       options:
         - http-server-close
diff --git a/base/hostconfig/init.sls b/base/hostconfig/init.sls
index b6a0376..4d560a2 100644
--- a/base/hostconfig/init.sls
+++ b/base/hostconfig/init.sls
@@ -1,5 +1,7 @@
-include:
-  - base.hostconfig.{{ grains.get('nodename') | regex_replace('[0-9]', '', ignorecase=True) }}
 
-{% include salt['grains.get']('host') + '.sls' ignore missing %} 
+{% set canonical_name = salt['grains.get']('host') | regex_replace('[0-9]', '', ignorecase=True) -%}
+{% include [ 
+             './' + canonical_name + '.sls', 
+             './' + salt['grains.get']('host') + '.sls' 
+           ] ignore missing %} 
    
diff --git a/base/init.sls b/base/init.sls
index c2d3840..a5ff40f 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -3,9 +3,9 @@
 ---
 
 include:
-  - base.services
-  - base.hardware
-  - base.hostconfig
-  - base.sysctl
+  - .services
+  - .hardware
+  - .hostconfig
+  - .sysctl
   - saltmine
   - prometheus.node_exporter