diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index ced90947d6d4278ef8bbe732cc232d6517041f2d..071ae9b200fb8f6e440330f157bd8d6afa5c1502 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(DEFINED ENV{INSTALLPATH_NOMAD_JOBS})
-    SET (NOMAD_INSTALL $ENV{INSTALLPATH_NOMAD_JOBS}/nomad_jobs)
+    SET (NOMAD_INSTALL $ENV{INSTALLPATH_NOMAD_JOBS})
 else()
     SET (NOMAD_INSTALL ${CMAKE_INSTALL_PREFIX}/nomad_jobs)
 endif()
diff --git a/deploy/asapo_services/asap3.tfvars b/deploy/asapo_services/asap3.tfvars
index 42982885bb498c3568d6d377001bbebb5e3c3303..0b32c995fab90837b7d357e9223a1c351b4a403c 100644
--- a/deploy/asapo_services/asap3.tfvars
+++ b/deploy/asapo_services/asap3.tfvars
@@ -1,12 +1,10 @@
-consul_dns_port = 53
-
 elk_logs = true
 
-service_dir="/bldocuments/support/asapo"
-data_dir="/bldocuments/support/asapo/data"
-mongo_dir="/bldocuments/support/asapo/mongodb"
-asapo_user="994:989"
-job_scripts_dir="/bldocuments/support/asapo/config/nomad_jobs/terraform_scripts"
+service_dir="/gpfs/asapo/shared/service_dir"
+data_dir="/beamline"
+mongo_dir="/gpfs/asapo/shared/service_dir/mongodb"
+asapo_user="35841:1000"
+job_scripts_dir="/gpfs/asapo/shared/terraform"
 
 receiver_total_memory_size = 35000
 receiver_dataserver_cache_size = 30 #gb
diff --git a/deploy/asapo_services/copy_asap3.sh.in b/deploy/asapo_services/copy_asap3.sh.in
index 5bea7f39408d200e2c1b4b1566ff80d87bc48a37..59bd40ce2eb52bae06ec7c37fca76ca73459bb71 100755
--- a/deploy/asapo_services/copy_asap3.sh.in
+++ b/deploy/asapo_services/copy_asap3.sh.in
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 
-scp scripts/* psana002:@NOMAD_INSTALL@/terraform_scripts/
-scp asap3.tfvars psana002:@NOMAD_INSTALL@/terraform_scripts/
+scp scripts/* asap3-utl01:@NOMAD_INSTALL@/terraform/
+scp asap3.tfvars asap3-utl01:@NOMAD_INSTALL@/terraform/
+ssh asap3-utl01 chown asapo: -R @NOMAD_INSTALL@/terraform/
+ssh asap3-utl01 rm @NOMAD_INSTALL@/terraform/auth_secret.key
+ssh asap3-utl01 ln -s @NOMAD_INSTALL@/access/secret.key @NOMAD_INSTALL@/terraform/auth_secret.key
diff --git a/deploy/asapo_services/scripts/asapo-brokers.nmd.tpl b/deploy/asapo_services/scripts/asapo-brokers.nmd.tpl
index 8074880c0aac8eeac8edba540dc0ec75dfadc05b..e96dc1a954aacfdc6ecef2a325926544e171b151 100644
--- a/deploy/asapo_services/scripts/asapo-brokers.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-brokers.nmd.tpl
@@ -1,8 +1,8 @@
 job "asapo-brokers" {
   datacenters = ["dc1"]
   affinity {
-    attribute = "$${meta.asapo_service}"
-    value     = "false"
+    attribute = "$${meta.node_group}"
+    value     = "blprx"
     weight    = 100
   }
 
diff --git a/deploy/asapo_services/scripts/asapo-logging.nmd.tpl b/deploy/asapo_services/scripts/asapo-logging.nmd.tpl
index 1f0af9df646f1427ad97e9a3e8bedd7878304cbe..3252f86773cdc6f57a0b244ec47ef24a3ed1869d 100644
--- a/deploy/asapo_services/scripts/asapo-logging.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-logging.nmd.tpl
@@ -1,8 +1,8 @@
 job "asapo-logging" {
   datacenters = ["dc1"]
   affinity {
-    attribute = "$${meta.asapo_service}"
-    value     = "true"
+    attribute = "$${meta.node_group}"
+    value     = "utl"
     weight    = 100
   }
 
diff --git a/deploy/asapo_services/scripts/asapo-mongo.nmd.tpl b/deploy/asapo_services/scripts/asapo-mongo.nmd.tpl
index 4ed27586b36c4325653ae0891877628f05a01ee5..cc6389d8b93da7a9b6353dc7f8ee4d79ffac4780 100644
--- a/deploy/asapo_services/scripts/asapo-mongo.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-mongo.nmd.tpl
@@ -1,8 +1,8 @@
 job "asapo-mongo" {
   datacenters = ["dc1"]
   affinity {
-    attribute = "$${meta.asapo_service}"
-    value     = "false"
+    attribute = "$${meta.node_group}"
+    value     = "blprx"
     weight    = 100
   }
   update {
diff --git a/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl b/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl
index 21d815c06828a0724d3b6963d9a19e5b751c860e..6033581d872d53ae108a892f0754c5bff98b901a 100644
--- a/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl
@@ -1,8 +1,8 @@
 job "asapo-perfmetrics" {
   datacenters = ["dc1"]
   affinity {
-    attribute = "$${meta.asapo_service}"
-    value     = "true"
+    attribute = "$${meta.node_group}"
+    value     = "utl"
     weight    = 100
   }
 
diff --git a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
index 2a2035ea5070e20ba9a03f727015abff6fad0535..969ef465274b6b4ec43f96d60e520645278ef62c 100644
--- a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
@@ -1,8 +1,8 @@
 job "asapo-receivers" {
   datacenters = ["dc1"]
   affinity {
-    attribute = "$${meta.asapo_service}"
-    value     = "false"
+    attribute = "$${meta.node_group}"
+    value     = "blprx"
     weight    = 100
   }
 
diff --git a/deploy/asapo_services/scripts/asapo-services.nmd.tpl b/deploy/asapo_services/scripts/asapo-services.nmd.tpl
index 98b12180b40a6cb038bb28a58580037dcef77e2b..4dc5ceafd6f2ff6ab95441840c506002ba5aad64 100644
--- a/deploy/asapo_services/scripts/asapo-services.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-services.nmd.tpl
@@ -1,8 +1,8 @@
 job "asapo-services" {
   datacenters = ["dc1"]
   affinity {
-    attribute = "$${meta.asapo_service}"
-    value     = "true"
+    attribute = "$${meta.node_group}"
+    value     = "utl"
     weight    = 100
   }
 
diff --git a/deploy/nomad_consul_package/CMakeLists.txt b/deploy/nomad_consul_package/CMakeLists.txt
index 3ae6016eabce64b43cd65a03a17360f297db7109..7df2068d7a549e0ed07fd8aad34243a618fc5884 100644
--- a/deploy/nomad_consul_package/CMakeLists.txt
+++ b/deploy/nomad_consul_package/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory (Packages)
 INCLUDE(ExternalProject)
 ExternalProject_Add(
         consul
-        URL https://releases.hashicorp.com/consul/1.2.0/consul_1.2.0_linux_amd64.zip
+        URL https://releases.hashicorp.com/consul/1.6.2/consul_1.6.2_linux_amd64.zip
         PATCH_COMMAND ""
         CONFIGURE_COMMAND ""
         CMAKE_COMMAND ""
@@ -18,7 +18,7 @@ ExternalProject_Add(
 
 ExternalProject_Add(
         nomad
-        URL https://releases.hashicorp.com/nomad/0.8.4/nomad_0.8.4_linux_amd64.zip
+        URL https://releases.hashicorp.com/nomad/0.10.2/nomad_0.10.2_linux_amd64.zip
         PATCH_COMMAND ""
         CONFIGURE_COMMAND ""
         CMAKE_COMMAND ""
@@ -27,16 +27,30 @@ ExternalProject_Add(
         INSTALL_COMMAND ""
 )
 
+ExternalProject_Add(
+        terraform
+        URL https://releases.hashicorp.com/terraform/0.12.19/terraform_0.12.19_linux_amd64.zip
+        PATCH_COMMAND ""
+        CONFIGURE_COMMAND ""
+        CMAKE_COMMAND ""
+        BUILD_IN_SOURCE 1
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+)
 
 ExternalProject_Get_Property(consul SOURCE_DIR)
 set (CONSUL_SOURCE_DIR ${SOURCE_DIR})
 ExternalProject_Get_Property(nomad SOURCE_DIR)
 set (NOMAD_SOURCE_DIR ${SOURCE_DIR})
+ExternalProject_Get_Property(terraform SOURCE_DIR)
+set (TERRAFORM_SOURCE_DIR ${SOURCE_DIR})
+
+
 
 install(PROGRAMS ${CONSUL_SOURCE_DIR}/consul DESTINATION bin)
 install(PROGRAMS ${NOMAD_SOURCE_DIR}/nomad DESTINATION bin)
 
-install(PROGRAMS ${NOMAD_SOURCE_DIR}/nomad DESTINATION bin)
+install(PROGRAMS ${TERRAFORM_SOURCE_DIR}/terraform DESTINATION bin)
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/usr/lib/systemd/system/
         DESTINATION  /usr/lib/systemd/system)
\ No newline at end of file
diff --git a/deploy/nomad_consul_package/Packages/CMakeLists.txt b/deploy/nomad_consul_package/Packages/CMakeLists.txt
index fe7829db5fd63c8ec27893ead4f27320515d8e16..63a6580b009d4ce7617f2e5232e5e7e95bfb2d72 100644
--- a/deploy/nomad_consul_package/Packages/CMakeLists.txt
+++ b/deploy/nomad_consul_package/Packages/CMakeLists.txt
@@ -1,6 +1,6 @@
 # create debian package
 
-SET(CPACK_BINARY_DEB ON)
+SET(CPACK_BINARY_DEB OFF)
 SET(CPACK_BINARY_RPM ON)
 
 #SET (CPACK_DEBIAN_PACKAGE_MAINTAINER "Sergey Yakubov (sergey.yakubov@desy.de)")
@@ -14,7 +14,7 @@ SET(CPACK_PACKAGE_NAME "asapo-ha")
 SET(CPACK_PACKAGE_VENDOR "DESY")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "2")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "6")
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Nomad and Consul for Asapo Debian package")
 
@@ -22,8 +22,6 @@ SET(CPACK_BINARY_STGZ OFF)
 SET(CPACK_BINARY_TBZ2 OFF)
 SET(CPACK_BINARY_TGZ OFF)
 SET(CPACK_BINARY_TZ OFF)
-SET(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
 
 INCLUDE(CPack)
 
diff --git a/deploy/nomad_consul_package/Packages/postinst b/deploy/nomad_consul_package/Packages/postinst
deleted file mode 100755
index 54d8d8ac79b08cc80d60e25b421eac467919f318..0000000000000000000000000000000000000000
--- a/deploy/nomad_consul_package/Packages/postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-useradd -r -s /bin/false asapo || true
diff --git a/deploy/nomad_consul_package/make_package b/deploy/nomad_consul_package/make_package
new file mode 100755
index 0000000000000000000000000000000000000000..8634ca6f689ccaaf5d448a2efb0a7516d2e8ca12
--- /dev/null
+++ b/deploy/nomad_consul_package/make_package
@@ -0,0 +1,22 @@
+rm *.rpm
+cmake .
+cmake .
+make package
+rm *.cmake
+rm -rf CMakeFiles
+rm -rf *_CPack_*
+rm Makefile
+rm CMakeCache.txt
+rm install*.txt
+rm -rf consul-prefix nomad-prefix terraform-prefix
+
+cd Packages
+rm *.cmake
+rm -rf CMakeFiles
+rm -rf *_CPack_*
+rm Makefile
+rm CMakeCache.txt
+rm install*.txt
+
+cd -
+
diff --git a/deploy/nomad_consul_package/usr/lib/systemd/system/consul.service b/deploy/nomad_consul_package/usr/lib/systemd/system/consul.service
index 4c0b1e24d773eb4d0354656b2149afd346d37705..a1b1d9d62d1761be1b706ee490cf79db4c5d66ad 100644
--- a/deploy/nomad_consul_package/usr/lib/systemd/system/consul.service
+++ b/deploy/nomad_consul_package/usr/lib/systemd/system/consul.service
@@ -6,13 +6,12 @@ Documentation=https://consul.io/docs/
 
 [Service]
 User=asapo
-Group=asapo
+Group=it
 Environment=GOMAXPROCS=4
 Restart=on-failure
 ExecStart=/usr/bin/consul agent -config-dir=/etc/consul.d
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGINT
-AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]
 WantedBy=multi-user.target
diff --git a/deploy/nomad_consul_package/usr/lib/systemd/system/nomad.service b/deploy/nomad_consul_package/usr/lib/systemd/system/nomad.service
index 624f441526389071c2690888486ee31b731a9287..9fb22601505320d063793107ff98fa07f989402f 100644
--- a/deploy/nomad_consul_package/usr/lib/systemd/system/nomad.service
+++ b/deploy/nomad_consul_package/usr/lib/systemd/system/nomad.service
@@ -7,7 +7,7 @@ After=consul.service
 
 [Service]
 User=asapo
-Group=asapo
+Group=it
 Environment=GOMAXPROCS=4
 Restart=on-failure
 ExecStart=/usr/bin/nomad agent -config=/etc/nomad.d