diff --git a/stackl/agent/agent/kubernetes/handlers/ansible_handler.py b/stackl/agent/agent/kubernetes/handlers/ansible_handler.py
index 5018b4f..be10b33 100644
--- a/stackl/agent/agent/kubernetes/handlers/ansible_handler.py
+++ b/stackl/agent/agent/kubernetes/handlers/ansible_handler.py
@@ -3,11 +3,10 @@
 """
 import json
 import os
+from typing import List
 from agent.kubernetes.handlers.ansible_plugins.inventory import STACKL_PLUGIN
 from agent.kubernetes.handlers.ansible_plugins.callback import ANSIBLE_CALLBACK_PLUGIN
 
-from typing import List
-
 from agent.kubernetes.kubernetes_secret_factory import get_secret_handler
 
 from .base_handler import Handler
diff --git a/stackl/agent/agent/kubernetes/handlers/ansible_plugins/callback.py b/stackl/agent/agent/kubernetes/handlers/ansible_plugins/callback.py
index b75ead0..9b93ccc 100644
--- a/stackl/agent/agent/kubernetes/handlers/ansible_plugins/callback.py
+++ b/stackl/agent/agent/kubernetes/handlers/ansible_plugins/callback.py
@@ -1,3 +1,6 @@
+"""
+Stackl callback plugin for Ansible
+"""
 ANSIBLE_CALLBACK_PLUGIN = """
 DOCUMENTATION = '''
     author: GBrawl
diff --git a/stackl/agent/agent/kubernetes/handlers/ansible_plugins/inventory.py b/stackl/agent/agent/kubernetes/handlers/ansible_plugins/inventory.py
index b8d9ee5..2dd5d36 100644
--- a/stackl/agent/agent/kubernetes/handlers/ansible_plugins/inventory.py
+++ b/stackl/agent/agent/kubernetes/handlers/ansible_plugins/inventory.py
@@ -1,4 +1,6 @@
-
+"""
+Stackl inventory script for Ansible
+"""
 STACKL_PLUGIN = """
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
@@ -271,4 +273,4 @@ def parse(self, inventory, loader, path, cache):
         except Exception as e:
             raise AnsibleError('Error: this was original exception: %s' %
                                to_native(e))
-"""
\ No newline at end of file
+"""
diff --git a/stackl/agent/agent/kubernetes/outputs/output.py b/stackl/agent/agent/kubernetes/outputs/output.py
index 9336f91..3d7181e 100644
--- a/stackl/agent/agent/kubernetes/outputs/output.py
+++ b/stackl/agent/agent/kubernetes/outputs/output.py
@@ -56,8 +56,6 @@ def stackl_container(self):
         """
         return client.V1Container(name='stackl-output',
                                   image=self.stackl_cli_image,
-                                  env=self.env,
-                                  volume_mounts=self.volume_mounts,
                                   image_pull_policy='Always',
                                   command=self.stackl_cli_command,
                                   args=[self.stackl_cli_command_args])
diff --git a/stackl/core/core/handler/stack_handler.py b/stackl/core/core/handler/stack_handler.py
index 30ae38f..a8a38b1 100644
--- a/stackl/core/core/handler/stack_handler.py
+++ b/stackl/core/core/handler/stack_handler.py
@@ -350,11 +350,7 @@ def update_service_definition(self, count, item, opa_service_params,
             **stack_instance.service_secrets.get(svc, {})
         }
         service_definition.agent = agent
-        if "stackl_hostname" in service_definition.provisioning_parameters:
-            service_definition.template_hosts(
-                service_definition.provisioning_parameters["stackl_hostname"],
-                service_definition.provisioning_parameters.get(
-                    "instances", None), count + 1)
+
         return service_definition
 
     def add_outputs(self, outputs_update):
@@ -375,11 +371,14 @@ def add_outputs(self, outputs_update):
                     **service_definition.outputs,
                     **outputs_update.outputs
                 }
-            service_definition.provisioning_parameters = {
-                **service_definition.provisioning_parameters,
-                **stack_instance.instance_outputs,
-                **service_definition.outputs
-            }
+                service_definition.provisioning_parameters = {
+                    **service_definition.provisioning_parameters,
+                    **stack_instance.instance_outputs,
+                    **service_definition.outputs
+                }
+                if "stackl_hosts" in service_definition.outputs:
+                            service_definition.hosts = service_definition.outputs[
+                                "stackl_hosts"]
 
         return stack_instance