diff --git a/modules/openstack_project/templates/mirror.vhost.erb b/modules/openstack_project/templates/mirror.vhost.erb
index b46f8cb83b..9cbed20d33 100644
--- a/modules/openstack_project/templates/mirror.vhost.erb
+++ b/modules/openstack_project/templates/mirror.vhost.erb
@@ -53,10 +53,20 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
 
     # TODO(jhesketh): Remove this after bandersnatch implements pep503
     # https://bitbucket.org/pypa/bandersnatch/pull-requests/20/fully-implement-pep-503-normalization/diff
+
+    # Special cases for openstack.nose_plugin & backports.*
+    RewriteRule ^(.*)/openstack-nose-plugin(.*)$ $1/openstack.nose_plugin$2
+    RewriteRule ^(.*)/backports-(.*)$ $1/backports.$2
+
+    RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*)
+    RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d
+    RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L]
+
     # Try again but replacing -'s with .'s
     RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-f
     RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-d
-    RewriteRule (.*)-(.*) $1.$2
+    RewriteRule (.*)-(.*) $1.$2 [N]
+
     RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*)
     RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d
     RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L]