diff --git a/scripts/tools/publish-nightly.js b/scripts/tools/publish-nightly.js
index 4134e277d1..d08cb22d40 100644
--- a/scripts/tools/publish-nightly.js
+++ b/scripts/tools/publish-nightly.js
@@ -37,7 +37,6 @@ const base = path.resolve(__dirname, '..', '..');
 const packagePaths = {
   core: ['core'],
   client: ['client'],
-  container: ['container'],
   oauth2: ['plugins', 'auth', 'src', 'auth-oauth2'],
   oidc: ['plugins', 'auth', 'src', 'auth-oidc'],
   client_support_angular: ['client-frameworks-support', 'client-support-angular'],
@@ -46,13 +45,17 @@ const packagePaths = {
 const publishPaths = {
   core: ['core', 'public'],
   client: ['client', 'public'],
-  container: ['container', 'public'],
   oauth2: ['plugins', 'auth', 'public', 'auth-oauth2'],
   oidc: ['plugins', 'auth', 'public', 'auth-oidc'],
   client_support_angular: ['client-frameworks-support', 'client-support-angular', 'dist', 'client-support-angular'],
   testing_utilities: ['client-frameworks-support', 'testing-utilities', 'dist']
 };
 
+if (process.env.NIGHTLY === 'true' && !process.env.NIGHTLY_VERSION) {
+  packagePaths.container = ['container'];
+  publishPaths.container = ['container', 'public'];
+}
+
 function execTrim(cmd) {
   return require('child_process')
     .execSync(cmd)
diff --git a/scripts/tools/release-cli/release-cli.js b/scripts/tools/release-cli/release-cli.js
index 872b1cecf2..542afc61cb 100644
--- a/scripts/tools/release-cli/release-cli.js
+++ b/scripts/tools/release-cli/release-cli.js
@@ -67,7 +67,7 @@ const installPaths = {
   testing_utilities: path.resolve(base, 'client-frameworks-support', 'testing-utilities')
 };
 
-if (process.env.NIGHTLY === 'true') {
+if (process.env.NIGHTLY === 'true' && !process.env.NIGHTLY_VERSION) {
   pkgJsonPaths.container = path.resolve(base, 'container', 'public', 'package.json');
   installPaths.container = path.resolve(base, 'container');
 }