diff --git a/.zuul.yaml b/.zuul.yaml
index de27ea51..c3bc2ed8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -180,6 +180,8 @@
           CELLSV2_SETUP: "singleconductor"
           # Node specific settings
           DATABASE_TYPE: mysql
+          # Glance should always be non-standalone
+          GLANCE_STANDALONE: False
       devstack_local_conf:
         post-config:
           $NEUTRON_CONF:
diff --git a/devstack.localrc.base b/devstack.localrc.base
index f34bce77..7f7393d4 100644
--- a/devstack.localrc.base
+++ b/devstack.localrc.base
@@ -27,3 +27,8 @@ VOLUME_BACKING_FILE_SIZE=10000M
 enable_service s-account s-container s-object s-proxy
 SWIFT_HASH=8213897fads879789asdf789
 SWIFT_REPLICAS=1
+
+# NOTE(danms): Until all recent versions of devstack support
+# standalone glance mode, just assume we are upgrading from/to
+# Glance as deployed with uwsgi.
+GLANCE_STANDALONE=False
diff --git a/devstack.localrc.target b/devstack.localrc.target
index 804e7ef5..ccb916b9 100644
--- a/devstack.localrc.target
+++ b/devstack.localrc.target
@@ -27,3 +27,8 @@ VOLUME_BACKING_FILE_SIZE=10000M
 enable_service s-account s-container s-object s-proxy
 SWIFT_HASH=8213897fads879789asdf789
 SWIFT_REPLICAS=1
+
+# NOTE(danms): Until all recent versions of devstack support
+# standalone glance mode, just assume we are upgrading from/to
+# Glance as deployed with uwsgi.
+GLANCE_STANDALONE=False