diff --git a/devstack/README-NFP-Advanced-Mode b/devstack/README-NFP-Advanced-Mode
index 47f13cfd1..4b55ee6f5 100644
--- a/devstack/README-NFP-Advanced-Mode
+++ b/devstack/README-NFP-Advanced-Mode
@@ -8,10 +8,7 @@ Fresh Installation Steps:
 (2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
     as local.conf
     # cd devstack/
-    # wget -O local.conf.zip https://review.openstack.org/cat/335405,89,devstack/local.conf.nfp
-    # unzip local.conf.zip
-    # mv local.conf*.nfp local.conf
-    # rm local.conf.zip
+    # wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/master/devstack/local.conf.nfp
 
 (3) Configure local.conf
     # Modify NFP_DEVSTACK_MODE to 'advanced'
diff --git a/devstack/README-NFP-Base-Mode b/devstack/README-NFP-Base-Mode
index d7604bdf6..d04c2aa67 100644
--- a/devstack/README-NFP-Base-Mode
+++ b/devstack/README-NFP-Base-Mode
@@ -8,10 +8,7 @@ Fresh Installation Steps:
 (2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
     as local.conf
     # cd devstack/
-    # wget -O local.conf.zip https://review.openstack.org/cat/335405,89,devstack/local.conf.nfp
-    # unzip local.conf.zip
-    # mv local.conf*.nfp local.conf
-    # rm local.conf.zip
+    # wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/master/devstack/local.conf.nfp
 
 (3) Install devstack.
     # ./stack.sh
diff --git a/devstack/local.conf.nfp b/devstack/local.conf.nfp
index 0f2a65335..f5ac9629a 100644
--- a/devstack/local.conf.nfp
+++ b/devstack/local.conf.nfp
@@ -17,7 +17,7 @@ SERVICE_TOKEN=admin
 # NFP Service
 ENABLE_NFP=True
 GBPSERVICE_REPO=https://git.openstack.org/openstack/group-based-policy.git
-GBPSERVICE_BRANCH=refs/changes/05/335405/89
+GBPSERVICE_BRANCH=master
 # Edit NFP_DEVSTACK_MODE with either 'base' or 'advanced'
 if [[ $ENABLE_NFP = True ]]; then
     NFP_DEVSTACK_MODE=base
diff --git a/gbpservice/tests/contrib/devstack/local-nfp.conf b/gbpservice/tests/contrib/devstack/local-nfp.conf
index 31061547f..af73a5c8c 100644
--- a/gbpservice/tests/contrib/devstack/local-nfp.conf
+++ b/gbpservice/tests/contrib/devstack/local-nfp.conf
@@ -15,7 +15,7 @@ Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlu
 GIT_BASE=${GIT_BASE:-git://git.openstack.org}
 
 GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
-#GBPSERVICE_BRANCH=master
+GBPSERVICE_BRANCH=master
 #GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
 #GBPSERVICE_BRANCH=refs/changes/85/298385/154
 
diff --git a/gbpservice/tests/contrib/devstack/local.conf b/gbpservice/tests/contrib/devstack/local.conf
index 40bedea81..1e1d2183e 100644
--- a/gbpservice/tests/contrib/devstack/local.conf
+++ b/gbpservice/tests/contrib/devstack/local.conf
@@ -15,7 +15,7 @@ Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlu
 GIT_BASE=${GIT_BASE:-git://git.openstack.org}
 
 GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
-#GBPSERVICE_BRANCH=stable/liberty
+GBPSERVICE_BRANCH=master
 #GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
 #GBPSERVICE_BRANCH=refs/changes/54/240954/47