diff --git a/WORKSPACE b/WORKSPACE
index ae91a8abe..36defec17 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -403,11 +403,9 @@ dockerfile_image(
 # Register the default py_toolchain / platform for containerized execution
 register_toolchains(
     "//toolchains:container_py_toolchain",
-    "@bazel_tools//tools/python:autodetecting_toolchain",
 )
 
 register_execution_platforms(
-    "@local_config_platform//:host",
     "//platforms:local_container_platform",
 )
 
diff --git a/docker/security/security_check.py b/docker/security/security_check.py
index 701d1f2f3..3c49723af 100644
--- a/docker/security/security_check.py
+++ b/docker/security/security_check.py
@@ -212,7 +212,7 @@ def _check_image(image, severity, whitelist):
 
 
 def _get_relevant_severities(severity):
-  return [k for k, v in _SEV_MAP.iteritems()
+  return [k for k, v in _SEV_MAP.items()
           if v >= _SEV_MAP.get(severity, 1)]
 
 
diff --git a/python/image.bzl b/python/image.bzl
index 5c9baa887..767ff7bca 100644
--- a/python/image.bzl
+++ b/python/image.bzl
@@ -44,10 +44,8 @@ def repositories():
     # Register the default py_toolchain / platform for containerized execution
     native.register_toolchains(
         "@io_bazel_rules_docker//toolchains:container_py_toolchain",
-        "@bazel_tools//tools/python:autodetecting_toolchain",
     )
     native.register_execution_platforms(
-        "@local_config_platform//:host",
         "@io_bazel_rules_docker//platforms:local_container_platform",
     )
 
diff --git a/python3/image.bzl b/python3/image.bzl
index b7673aee8..5e8a8cd2f 100644
--- a/python3/image.bzl
+++ b/python3/image.bzl
@@ -43,10 +43,8 @@ def repositories():
     # Register the default py_toolchain / platform for containerized execution
     native.register_toolchains(
         "@io_bazel_rules_docker//toolchains:container_py_toolchain",
-        "@bazel_tools//tools/python:autodetecting_toolchain",
     )
     native.register_execution_platforms(
-        "@local_config_platform//:host",
         "@io_bazel_rules_docker//platforms:local_container_platform",
     )