diff --git a/deploy/nightly/deploy-nightly.sh b/deploy/nightly/deploy-nightly.sh
index 8949b4c5..98c4d0a9 100644
--- a/deploy/nightly/deploy-nightly.sh
+++ b/deploy/nightly/deploy-nightly.sh
@@ -32,7 +32,7 @@ BASEDIR=/data/web/msc-pygeoapi-nightly
 PYGEOAPI_GITREPO=https://github.com/geopython/pygeoapi.git
 MSC_PYGEOAPI_GITREPO=https://github.com/ECCC-MSC/msc-pygeoapi.git
 DAYSTOKEEP=7
-export MSC_PYGEOAPI_OGC_API_URL=https://geomet-dev-03-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest/
+export MSC_PYGEOAPI_OGC_API_URL=https://geomet-dev-21-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest/
 export MSC_PYGEOAPI_ES_URL=http://localhost:9200
 export MSC_PYGEOAPI_OGC_API_URL_BASEPATH=/
 export MSC_PYGEOAPI_TEMPLATES=/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/theme/templates
diff --git a/deploy/nightly/msc-pygeoapi.wsgi b/deploy/nightly/msc-pygeoapi.wsgi
index 150a0ee2..aca86e4a 100644
--- a/deploy/nightly/msc-pygeoapi.wsgi
+++ b/deploy/nightly/msc-pygeoapi.wsgi
@@ -49,7 +49,7 @@ import sys
 os.environ['PYGEOAPI_CONFIG'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/deploy/nightly/msc-pygeoapi-config.yml'
 os.environ['PYGEOAPI_OPENAPI'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/deploy/nightly/msc-pygeoapi-openapi.yml'
 os.environ['MSC_PYGEOAPI_ES_URL'] = 'http://localhost:9200'
-os.environ['MSC_PYGEOAPI_OGC_API_URL'] = 'https://geomet-dev-03-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest'
+os.environ['MSC_PYGEOAPI_OGC_API_URL'] = 'https://geomet-dev-21-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest'
 os.environ['MSC_PYGEOAPI_OGC_API_URL_BASEPATH'] = '/'
 os.environ['MSC_PYGEOAPI_TEMPLATES'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/theme/templates'
 os.environ['MSC_PYGEOAPI_STATIC'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/theme/static'
diff --git a/msc_pygeoapi/process/weather/README.md b/msc_pygeoapi/process/weather/README.md
index 41ec98f9..61fbdb14 100644
--- a/msc_pygeoapi/process/weather/README.md
+++ b/msc_pygeoapi/process/weather/README.md
@@ -55,7 +55,7 @@ Fifth start pygeoapi
 ```bash
 pygeoapi serve
 ```
-Visit http://geomet-dev-03.cmc.ec.gc.ca:5000
+Visit http://geomet-dev-21.cmc.ec.gc.ca:5000
 
 Note: port 5000 is default port. Check `/deploy/default/msc-pygeoapi-config.yml` to double check port