diff --git a/assembly/assembly-wsagent-war/src/main/webapp/WEB-INF/classes/codenvy/che-openshift-machine-configuration.properties b/assembly/assembly-wsagent-war/src/main/webapp/WEB-INF/classes/codenvy/che-openshift-machine-configuration.properties
index 24acca0..1389677 100644
--- a/assembly/assembly-wsagent-war/src/main/webapp/WEB-INF/classes/codenvy/che-openshift-machine-configuration.properties
+++ b/assembly/assembly-wsagent-war/src/main/webapp/WEB-INF/classes/codenvy/che-openshift-machine-configuration.properties
@@ -9,4 +9,4 @@
 #   Codenvy, S.A. - initial API and implementation
 #
 
-che.openshift.api.endpoint=https://api.codenvy.openshift.com
+#che.openshift.api.endpoint=https://api.codenvy.openshift.com
diff --git a/dockerfiles/init/addon/modules/addon/manifests/init.pp b/dockerfiles/init/addon/modules/addon/manifests/init.pp
index f822226..d51e6e2 100644
--- a/dockerfiles/init/addon/modules/addon/manifests/init.pp
+++ b/dockerfiles/init/addon/modules/addon/manifests/init.pp
@@ -4,5 +4,15 @@
     ensure  => "present",
     content => template("addon/openshift.properties.erb"),
     mode    => "644",
+  } ->
+  file { "/opt/che/config/plugin-conf":
+    ensure  => "directory",
+    mode    => "755",
+  } ->
+  # creating ws-agent.properties
+  file { "/opt/che/config/plugin-conf/ws-agent.properties":
+    ensure  => "present",
+    content => template("addon/ws-agent.properties.erb"),
+    mode    => "644",
   }
 }
diff --git a/dockerfiles/init/addon/modules/addon/templates/ws-agent.properties.erb b/dockerfiles/init/addon/modules/addon/templates/ws-agent.properties.erb
new file mode 100644
index 0000000..72fe10b
--- /dev/null
+++ b/dockerfiles/init/addon/modules/addon/templates/ws-agent.properties.erb
@@ -0,0 +1,6 @@
+# ###################################
+# This file is managed by puppet
+# PLEASE DON'T MODIFY BY HAND
+# ###################################
+
+che.openshift.api.endpoint=<%= scope.lookupvar('addon::che_openshift_api_endpoint') %>