diff --git a/dkswarm.xai-corp.net.yml b/dkswarm.xai-corp.net.yml
index c78ff83..1093133 100644
--- a/dkswarm.xai-corp.net.yml
+++ b/dkswarm.xai-corp.net.yml
@@ -14,10 +14,10 @@
         - dkhost03
       workers:
         - dkhost04
+      removed:
         - dkhost02
-      removed: []
 
-      history: 3
+      history: 1
 
   roles:
     - docker_swarm_management
diff --git a/roles/docker_swarm_management/tasks/main.yml b/roles/docker_swarm_management/tasks/main.yml
index 5583ea0..227f768 100644
--- a/roles/docker_swarm_management/tasks/main.yml
+++ b/roles/docker_swarm_management/tasks/main.yml
@@ -35,14 +35,14 @@
   when: "ansible_nodename in swarm.managers"
 
 - name: adding worker to swarm
-  command: docker swarm join --token={{worker_token.stdout}} {{swarm.managers[0]}}:2376
+  command: docker swarm join --token={{worker_token.stdout}} {{swarm.managers[0]}}
   args:
     creates: /var/lib/docker/swarm/state.json
   when: "ansible_nodename in swarm.workers"
 
 # remove hosts from swarm
 - name: remove hosts from swam if found in remove list
-  command: docker swarm remove
+  command: docker swarm leave
   args:
     removes: /var/lib/docker/swarm/state.json
   when: "ansible_nodename in swarm.removed"
diff --git a/roles/dockerhost/files/daemon.json b/roles/dockerhost/files/daemon.json
index 1b96560..1a038bd 100644
--- a/roles/dockerhost/files/daemon.json
+++ b/roles/dockerhost/files/daemon.json
@@ -1,8 +1,9 @@
 {
   "insecure-registries": [
-    "192.168.2.41:5000"
+    "dkhost.xai-corp.net:5000"
   ],
   "dns": [
+    "192.168.2.12",
     "192.168.2.22",
     "8.8.8.8"
   ]
diff --git a/roles/dockerhost/tasks/install-xenial.yml b/roles/dockerhost/tasks/install-xenial.yml
index 716e0af..00508d9 100644
--- a/roles/dockerhost/tasks/install-xenial.yml
+++ b/roles/dockerhost/tasks/install-xenial.yml
@@ -52,12 +52,13 @@
     - docker-engine
 #    - virtualbox-guest-dkms
 
-#
-#- name: copy docker config file
-#  copy:
-#    src: daemon.json
-#    dest: /etc/docker/daemon.json
-#
+- name: copy docker config file
+  copy:
+    src: daemon.json
+    dest: /etc/docker/daemon.json
+  notify:
+    - restart docker
+
 #- name: create mount points for shares
 #  file:
 #    state: absent
diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 b/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
index 2213ad5..1cc012a 100644
--- a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
+++ b/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
@@ -9,7 +9,6 @@ $TTL 1D
 xai-corp.net.           IN NS   ns.xai-corp.net.
 xai-corp.net.           IN MX   0 mail.xai-corp.net.
 xai-corp.net.           IN TXT  "v=spf1 ip4:192.168.2.11/32 mx ptr mx:mail.xai-corp.net ~all"
-ns                      IN A    192.168.2.22
 mail                    IN A    192.168.2.12
 
 gateway                 IN A    192.168.2.1
@@ -21,30 +20,37 @@ tv                      IN A    192.168.2.16
 xaicorp1                IN A    192.168.2.103
 garden                  IN A    192.168.2.20
 
+; bare metal servers
 home                    IN A    192.168.2.11
-
 cubox-i                 IN A    192.168.2.12
-ns02                    IN A    192.168.2.12
+
+; virtual machine servers
+home02                  IN A    192.168.2.22
+dkhost01                IN A    192.168.2.41
+dkhost02                IN A    192.168.2.43
+dkhost03                IN A    192.168.2.53
+dkhost04                IN A    192.168.2.54
+
+; dns servers
+ns                      IN A    192.168.2.22
+ns02                    IN CNAME    cubox-i
+
+; gluster servers
+gluster                 IN A    192.168.2.11
 gluster                 IN A    192.168.2.12
 
-home02                  IN A    192.168.2.22
-
+; docker swarm nodes
 dkhost                  IN A    192.168.2.41
 ;dkhost                  IN A    192.168.2.43
 dkhost                  IN A    192.168.2.53
 dkhost                  IN A    192.168.2.54
 
-dkhost01                IN A    192.168.2.41
-sql                     IN A    192.168.2.41
-tripbuilder             IN A    192.168.2.41
-
-dkhost02                IN A    192.168.2.43
+; service domains
 fs                      IN CNAME    dkhost
 git                     IN CNAME    dkhost
 dkui                    IN CNAME    dkhost
 jenkins                 IN CNAME    dkhost
 logs                    IN CNAME    dkhost
 dkregistry              IN CNAME    dkhost
-
-dkhost03                IN A    192.168.2.53
-dkhost04                IN A    192.168.2.54
+sql                     IN CNAME    dkhost
+tripbuilder             IN CNAME    dkhost