diff --git a/scripts/rh1-env.yaml b/scripts/rh1-env.yaml
index 4d1f7f3a8..b0f725ed4 100644
--- a/scripts/rh1-env.yaml
+++ b/scripts/rh1-env.yaml
@@ -1,6 +1,6 @@
 parameter_defaults:
   CloudName: ci-overcloud.rh1.tripleo.org
-  controllerExtraConfig:
+  ControllerExtraConfig:
     tripleo::loadbalancer::public_virtual_ip: 66.187.229.2
     neutron::agents::ml2::ovs::prevent_arp_spoofing: false
     # https://bugs.launchpad.net/tripleo/+bug/1590101
diff --git a/scripts/rh2-env.yaml b/scripts/rh2-env.yaml
index b87fa16fe..e71ea46c3 100644
--- a/scripts/rh2-env.yaml
+++ b/scripts/rh2-env.yaml
@@ -1,6 +1,6 @@
 parameter_defaults:
   CloudName: ci-overcloud.rh2.tripleo.org
-  controllerExtraConfig:
+  ControllerExtraConfig:
     tripleo::loadbalancer::public_virtual_ip: 8.43.87.224
     neutron::agents::ml2::ovs::prevent_arp_spoofing: false
     # https://bugs.launchpad.net/tripleo/+bug/1590101
diff --git a/test-environments/worker-config-mitaka-and-below.yaml b/test-environments/worker-config-mitaka-and-below.yaml
deleted file mode 100644
index 83bbfbaf2..000000000
--- a/test-environments/worker-config-mitaka-and-below.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameter_defaults:
-  # HeatWorkers doesn't modify num_engine_workers, so handle
-  # via heat::config
-  controllerExtraConfig:
-    heat::config::heat_config:
-      DEFAULT/num_engine_workers:
-        value: 1
-  # In newton and above, these parameters are set by low-memory-usage.yaml from t-h-t
-  HeatWorkers: 1
-  CeilometerWorkers: 1
-  CinderWorkers: 1
-  GlanceWorkers: 1
-  KeystoneWorkers: 4
-  NeutronWorkers: 1
-  NovaWorkers: 1
-  SwiftWorkers: 1
-  NovaComputeExtraConfig:
-    # Required for Centos 7.3 and Qemu 2.6.0
-    nova::compute::libvirt::libvirt_cpu_mode: 'none'
diff --git a/test-environments/worker-config.yaml b/test-environments/worker-config.yaml
index 67bceea96..1c0b8d90c 100644
--- a/test-environments/worker-config.yaml
+++ b/test-environments/worker-config.yaml
@@ -1,7 +1,7 @@
 # TODO(bnemec): Should these settings be moved to low-memory-usage.yaml
 # in tripleo-heat-templates?
 parameter_defaults:
-  controllerExtraConfig:
+  ControllerExtraConfig:
     heat::api_cloudwatch::enabled: false
     heat::api_cfn::enabled: false
     heat::rpc_response_timeout: 600
diff --git a/toci_gate_test-orig.sh b/toci_gate_test-orig.sh
index 5a6171557..2beebe8f0 100755
--- a/toci_gate_test-orig.sh
+++ b/toci_gate_test-orig.sh
@@ -173,13 +173,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
         updates)
             if [[ "$TOCI_JOBTYPE" =~ 'ovb-updates' ]] ; then
                 NODECOUNT=3
-                if [[ "${STABLE_RELEASE}" =~ ^mitaka$ ]] ; then
-                    ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
-                    CA_ENVIRONMENT_FILE=inject-trust-anchor-ipv6.yaml
-                else
-                    ENDPOINT_LIST_LOCATION=/usr/share/openstack-tripleo-heat-templates/environments
-                    CA_ENVIRONMENT_FILE=inject-trust-anchor-hiera-ipv6.yaml
-                fi
+                ENDPOINT_LIST_LOCATION=/usr/share/openstack-tripleo-heat-templates/environments
+                CA_ENVIRONMENT_FILE=inject-trust-anchor-hiera-ipv6.yaml
                 OVERCLOUD_DEPLOY_ARGS="
                     $OVERCLOUD_DEPLOY_ARGS
                     -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml
@@ -252,13 +247,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             PREDICTABLE_PLACEMENT=1
             ;;
         nonha)
-            if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
-                ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
-                CA_ENVIRONMENT_FILE=inject-trust-anchor.yaml
-            else
-                ENDPOINT_LIST_LOCATION=/usr/share/openstack-tripleo-heat-templates/environments
-                CA_ENVIRONMENT_FILE=inject-trust-anchor-hiera.yaml
-            fi
+            ENDPOINT_LIST_LOCATION=/usr/share/openstack-tripleo-heat-templates/environments
+            CA_ENVIRONMENT_FILE=inject-trust-anchor-hiera.yaml
             OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable-tls.yaml -e $ENDPOINT_LIST_LOCATION/tls-endpoints-public-ip.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/$CA_ENVIRONMENT_FILE --ceph-storage-scale 1 -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/ceph-min-osds.yaml"
             if [ "$STABLE_RELEASE" != "newton" ]; then
                     OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/disable-telemetry.yaml"
@@ -345,11 +335,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             CACHEUPLOAD=1
             OVERCLOUD_PINGTEST_ARGS=
             ;;
-        mitaka)
-            # This is handled in tripleo.sh (it always uses centos7-$STABLE_RELEASE/current)
-            # where $STABLE_RELEASE is derived in toci_instack.sh
-            unset DELOREAN_REPO_URL
-            ;;
         tempest)
             export RUN_TEMPEST_TESTS=1
             export RUN_PING_TEST=0
@@ -394,9 +379,7 @@ if [[ $PREDICTABLE_PLACEMENT == 1 ]]; then
     OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/ips-from-pool-all.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/hostname-map.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/scheduler-hints.yaml"
 fi
 # Limit worker counts to avoid overloading our limited resources
-if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
-    OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
-elif [[ "${OVERCLOUD_MAJOR_UPGRADE}" == "1" ]]; then
+if [[ "${OVERCLOUD_MAJOR_UPGRADE}" == "1" ]]; then
     OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
 else
     OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"