diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate
index a3d6016e5..80d032580 100644
--- a/contrib/devstack/lib/designate
+++ b/contrib/devstack/lib/designate
@@ -134,9 +134,9 @@ function create_designate_accounts() {
             keystone endpoint-create \
                 --region RegionOne \
                 --service_id $DESIGNATE_SERVICE \
-                --publicurl "http://$SERVICE_HOST:9001/v1" \
-                --adminurl "http://$SERVICE_HOST:9001/v1" \
-                --internalurl "http://$SERVICE_HOST:9001/v1"
+                --publicurl "http://$SERVICE_HOST:9001/" \
+                --adminurl "http://$SERVICE_HOST:9001/" \
+                --internalurl "http://$SERVICE_HOST:9001/"
         fi
     fi
 }
diff --git a/tools/designate-keystone-setup b/tools/designate-keystone-setup
index e6a062481..f54a2e528 100644
--- a/tools/designate-keystone-setup
+++ b/tools/designate-keystone-setup
@@ -194,5 +194,5 @@ add_role $DESIGNATE_USERID $SERVICE_TENANT $ADMIN_ROLE $DESIGNATE_USERNAME
 
 DESIGNATE_SERVICE=$(get_service designate dns \
                    "Designate DNSaaS")
-API_URL=${API_URL:-http://localhost:9001/v1}
+API_URL=${API_URL:-http://localhost:9001/}
 add_endpoint $DESIGNATE_SERVICE $API_URL