diff --git a/roles/jenkins/master/templates/slave-config.xml.j2 b/roles/jenkins/master/templates/slave-config.xml.j2
index b4a405f9e5..e27200b7d9 100644
--- a/roles/jenkins/master/templates/slave-config.xml.j2
+++ b/roles/jenkins/master/templates/slave-config.xml.j2
@@ -2,7 +2,7 @@
 <slave>
   <name>{{ item.name }}</name>
   <description>{{ item.description }}</description>
-  <remoteFS>&apos;./jenkins-slave</remoteFS>
+  <remoteFS>/srv/jenkins</remoteFS>
   <numExecutors>1</numExecutors>
   <mode>NORMAL</mode>
   <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml
index 43864a7a19..a22d546d3c 100644
--- a/roles/jenkins/slave/tasks/main.yml
+++ b/roles/jenkins/slave/tasks/main.yml
@@ -23,3 +23,10 @@
   - jenkins
   - jenkins/slave
   - config
+
+- name: create workspace directory
+  action: file state=directory path=/srv/jenkins owner=jenkins group=jenkins
+  tags:
+  - jenkins
+  - jenkins/slave
+  - config