diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index ee5773bb86..aec738f05b 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -75,12 +75,6 @@ RUN echo > /etc/apache2/ports.conf \
     && cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \
     && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
     && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
-    && rm /etc/openstack-dashboard/local_settings.py \
-    && rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
-    && rm -rf /usr/lib/python2.7/site-packages/openstack_dashboard \
-    && ln -s /etc/openstack-dashboard/local_settings /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
-    && ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python2.7/site-packages/openstack_dashboard \
-    && ln -s /usr/share/openstack-dashboard/static /usr/lib/python2.7/site-packages/static \
     && for locale in /usr/lib/python2.7/site-packages/*/locale; do \
            (cd ${locale%/*} && /usr/bin/python /usr/bin/manage.py compilemessages) \
        done
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 2e828a9de8..13735a364b 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -49,6 +49,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% elif base_distro in ['ubuntu'] %}
 
+        # FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx
+        # 13.0.0 package now.  add 'python-vmware-nsx' into
+        # neutron_base_packages list after UCA fixed the issue.
         {% set neutron_base_packages = [
             'iproute2',
             'iputils-ping',
@@ -62,8 +65,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-networking-sfc',
             'python-neutron-fwaas',
             'python-openvswitch',
-            'python-oslo.vmware',
-            'python-vmware-nsx'
+            'python-oslo.vmware'
         ] %}
 
     {% endif %}