diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index feba3cd2..54695d14 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -152,6 +152,7 @@ function configure_ec2api_networking {
 
     if [[ ,${ENABLED_SERVICES} =~ ,"q-" ]]; then
         iniset $EC2API_CONF_FILE DEFAULT full_vpc_support True
+        iniset $EC2API_CONF_FILE DEFAULT disable_ec2_api True
     else
         iniset $EC2API_CONF_FILE DEFAULT full_vpc_support False
     fi
diff --git a/install.sh b/install.sh
index 00359dbc..ee319ce4 100755
--- a/install.sh
+++ b/install.sh
@@ -217,8 +217,10 @@ function copynovaopt() {
 
 if [[ -n $(openstack catalog show network) ]]; then
     VPC_SUPPORT="True"
+    DISABLE_EC2_CLASSIC="True"
 else
     VPC_SUPPORT="False"
+    DISABLE_EC2_CLASSIC="False"
 fi
 if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
     declare -a newtron_output
@@ -272,6 +274,7 @@ iniset $CONF_FILE DEFAULT verbose True
 iniset $CONF_FILE DEFAULT keystone_ec2_tokens_url "$OS_AUTH_URL/v3/ec2tokens"
 iniset $CONF_FILE database connection "$CONNECTION"
 iniset $CONF_FILE DEFAULT full_vpc_support "$VPC_SUPPORT"
+iniset $CONF_FILE DEFAULT disable_ec2_classic "$DISABLE_EC2_CLASSIC"
 iniset $CONF_FILE DEFAULT external_network "$EXTERNAL_NETWORK"
 
 GROUP_AUTHTOKEN="keystone_authtoken"