diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe186305a..d328bcddca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,10 +33,11 @@ ENHANCEMENTS:
 * Move non-core DNS zones out of the network module to reduce dependencies [#3119](https://github.com/microsoft/AzureTRE/pull/3119)
 * Review VMs are being cleaned up when an Airlock request is canceled ([#3130](https://github.com/microsoft/AzureTRE/pull/3130))
 * Sample queries to investigate logs of the core TRE applications ([#3151](https://github.com/microsoft/AzureTRE/pull/3151))
+* Remove support of docker-in-docker for templates/bundles ([#3180](https://github.com/microsoft/AzureTRE/pull/3180))
 
 BUG FIXES:
 * Reauth CLI if TRE endpoint has changed [#3137](https://github.com/microsoft/AzureTRE/pull/3137)
-* Added Migration for Airlock requests that were created prior to version 0.5.0  ([#3152](https://github.com/microsoft/AzureTRE/pull/3152))
+* Added Migration for Airlock requests that were created prior to version 0.5.0 ([#3152](https://github.com/microsoft/AzureTRE/pull/3152))
 * Temporarly use the remote bundle for `check-params` target [#3149](https://github.com/microsoft/AzureTRE/pull/3149)
 
 COMPONENTS:
diff --git a/Makefile b/Makefile
index 3d9d6d14c3..2cb8e91681 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ bundle-install: # bundle-check-params # TODO: uncomment when resolved https://gi
 	&& porter install --parameter-set $$(yq ".name" porter.yaml) \
 		--credential-set arm_auth \
 		--credential-set aad_auth \
-		--allow-docker-host-access --debug
+		--debug
 
 # Validates that the parameters file is synced with the bundle.
 # The file is used when installing the bundle from a local machine.
@@ -244,7 +244,7 @@ bundle-uninstall:
 	&& porter uninstall --parameter-set $$(yq ".name" porter.yaml) \
 		--credential-set arm_auth \
 		--credential-set aad_auth \
-		--allow-docker-host-access --debug
+		--debug
 
 bundle-custom-action:
  	$(call target_title, "Performing:${ACTION} ${DIR} with Porter") \
@@ -258,7 +258,7 @@ bundle-custom-action:
  	&& porter invoke --action ${ACTION} --parameter-set $$(yq ".name" porter.yaml) \
 		--credential-set arm_auth \
 		--credential-set aad_auth \
-		--allow-docker-host-access --debug
+		--debug
 
 bundle-publish:
 	$(call target_title, "Publishing ${DIR} bundle with Porter") \
diff --git a/resource_processor/_version.py b/resource_processor/_version.py
index dd9b22cccc..722515271f 100644
--- a/resource_processor/_version.py
+++ b/resource_processor/_version.py
@@ -1 +1 @@
-__version__ = "0.5.1"
+__version__ = "0.5.2"
diff --git a/resource_processor/resources/commands.py b/resource_processor/resources/commands.py
index dfcf27b899..13c2864fbd 100644
--- a/resource_processor/resources/commands.py
+++ b/resource_processor/resources/commands.py
@@ -68,7 +68,7 @@ async def build_porter_command(config, logger, msg_body, custom_action=False):
                     f"{' invoke --action' if custom_action else ''}"
                     f" {msg_body['action']} \"{installation_id}\""
                     f" --reference {config['registry_server']}/{msg_body['name']}:v{msg_body['version']}"
-                    f" {porter_parameters} --allow-docker-host-access --force"
+                    f" {porter_parameters} --force"
                     f" --credential-set arm_auth"
                     f" --credential-set aad_auth"
                     ]
diff --git a/resource_processor/vmss_porter/runner.py b/resource_processor/vmss_porter/runner.py
index c01d2966df..56989a0e85 100644
--- a/resource_processor/vmss_porter/runner.py
+++ b/resource_processor/vmss_porter/runner.py
@@ -85,11 +85,10 @@ async def receive_message(service_bus_client, logger_adapter: logging.LoggerAdap
                         await receiver.complete_message(msg)
 
                     logger_adapter.info(f"Closing session: {receiver.session.session_id}")
-                    await renewer.close()
 
         except OperationTimeoutError:
             # Timeout occurred whilst connecting to a session - this is expected and indicates no non-empty sessions are available
-            logger_adapter.info("No sessions for this process. Will look again...")
+            logger_adapter.debug("No sessions for this process. Will look again...")
 
         except ServiceBusConnectionError:
             # Occasionally there will be a transient / network-level error in connecting to SB.