diff --git a/datamgr/Pipfile b/datamgr/Pipfile
index 704c6ce..84bd36a 100644
--- a/datamgr/Pipfile
+++ b/datamgr/Pipfile
@@ -16,4 +16,4 @@ pylint = "<2.0.0"
 pytest = "*"
 
 [requires]
-python_version = "3.5"
+python_version = "3.6"
diff --git a/deploy/deploy.yml b/deploy/deploy.yml
index e38e6ad..f29e139 100644
--- a/deploy/deploy.yml
+++ b/deploy/deploy.yml
@@ -8,12 +8,12 @@
       services:
         - name: 'commander'
           template: systemd_commander.service
-          working_directory: '{{ app.dir }}/commander'
+          working_directory: '{{ app.dir }}commander'
           python_version: python2.7
         - name: 'datamgr'
           template: systemd_datamgr.service
-          working_directory: '{{ app.dir }}/datamgr'
-          python_version: python3.5
+          working_directory: '{{ app.dir }}datamgr'
+          python_version: python3.6
   tasks:
     # Create virtual envs
     # ###################