diff --git a/deployment/puppet/nailgun/examples/nailgun-only.pp b/deployment/puppet/nailgun/examples/nailgun-only.pp
index 75cf8c0c14..17e5b903a3 100644
--- a/deployment/puppet/nailgun/examples/nailgun-only.pp
+++ b/deployment/puppet/nailgun/examples/nailgun-only.pp
@@ -141,9 +141,10 @@ class { "nailgun::client":
   keystone_pass => $::fuel_settings['FUEL_ACCESS']['password'],
 }
 class { "nailgun::supervisor":
-  nailgun_env   => $env_path,
-  ostf_env      => $env_path,
-  conf_file => "nailgun/supervisord.conf.nailgun.erb",
+  service_enabled => false,
+  nailgun_env     => $env_path,
+  ostf_env        => $env_path,
+  conf_file       => "nailgun/supervisord.conf.nailgun.erb",
 }
 
 package { 'crontabs':
diff --git a/deployment/puppet/nailgun/manifests/supervisor.pp b/deployment/puppet/nailgun/manifests/supervisor.pp
index f3e6cec33a..9f237b1ab3 100644
--- a/deployment/puppet/nailgun/manifests/supervisor.pp
+++ b/deployment/puppet/nailgun/manifests/supervisor.pp
@@ -1,4 +1,5 @@
 class nailgun::supervisor(
+  $service_enabled = true,
   $nailgun_env,
   $ostf_env,
   $conf_file = "nailgun/supervisord.conf.erb",
@@ -33,8 +34,8 @@ class nailgun::supervisor(
   }
 
   service { "supervisord":
-    ensure => "running",
-    enable => true,
+    ensure => $service_enabled,
+    enable => $service_enabled,
     require => [
                 Package["supervisor"],
                 ],