diff --git a/tasks/install.json b/tasks/install.json
index c279c49b..38da28bd 100644
--- a/tasks/install.json
+++ b/tasks/install.json
@@ -7,7 +7,7 @@
     },
     "collection": {
       "description": "The Puppet collection to install from (defaults to puppet, which maps to the latest collection released)",
-      "type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8]]"
+      "type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8, puppetcore8-nightly]]"
     },
     "absolute_source": {
       "description": "The absolute source location to find the Puppet agent package",
diff --git a/tasks/install_powershell.json b/tasks/install_powershell.json
index d13534f3..c64f5eb9 100644
--- a/tasks/install_powershell.json
+++ b/tasks/install_powershell.json
@@ -8,7 +8,7 @@
     },
     "collection": {
       "description": "The Puppet collection to install from (defaults to puppet, which maps to the latest collection released)",
-      "type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly]]"
+      "type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8, puppetcore8-nightly]]"
     },
     "absolute_source": {
       "description": "The absolute source location to find the Puppet agent package",
diff --git a/tasks/install_powershell.ps1 b/tasks/install_powershell.ps1
index 49039bd6..21f54601 100644
--- a/tasks/install_powershell.ps1
+++ b/tasks/install_powershell.ps1
@@ -116,7 +116,9 @@ if (Test-RunningServices) {
 }
 
 # Change windows_source only if the collection is a nightly build, and the source was not explicitly specified.
-if (($collection -like '*nightly*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
+if (($collection -like '*puppetcore*-nightly*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
+  $windows_source = 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads'
+} elseif (($collection -like '*nightly*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
   $windows_source = 'https://nightlies.puppet.com/downloads'
 } elseif (($collection -like '*puppetcore*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
   $windows_source = 'https://artifacts-puppetcore.puppet.com/v1/download'
@@ -124,7 +126,7 @@ if (($collection -like '*nightly*') -And -Not ($PSBoundParameters.ContainsKey('w
 
 if ($absolute_source) {
     $msi_source = "$absolute_source"
-} elseif ($collection -like '*puppetcore*') {
+} elseif (($collection -like '*puppetcore*') -And -Not ($collection -like 'puppetcore*-nightly')) {
     # dev param is case-sensitive, so don't use $True
     if (($version -split '\.').count -gt 3) {
         $dev = '&dev=true'
@@ -132,6 +134,9 @@ if ($absolute_source) {
         $dev = ''
     }
     $msi_source = "${windows_source}?type=native&version=${version}&os_name=windows&os_version=${major_os_version}&os_arch=${arch}&fips=${fips}${dev}"
+} elseif ($collection -like 'puppetcore*-nightly') {
+    $core_collection = $collection -replace "core", ""
+    $msi_source = "$windows_source/windows/${core_collection}/${msi_name}"
 } else {
     $msi_source = "$windows_source/windows/${collection}/${msi_name}"
 }
diff --git a/tasks/install_shell.json b/tasks/install_shell.json
index df2c23e2..3ff6d09c 100644
--- a/tasks/install_shell.json
+++ b/tasks/install_shell.json
@@ -9,7 +9,7 @@
     },
     "collection": {
       "description": "The Puppet collection to install from (defaults to puppet, which maps to the latest collection released)",
-      "type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8]]"
+      "type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8, puppetcore8-nightly]]"
     },
     "absolute_source": {
       "description": "The absolute source location to find the Puppet agent package",
diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh
index 00bd314c..495ee863 100644
--- a/tasks/install_shell.sh
+++ b/tasks/install_shell.sh
@@ -123,23 +123,27 @@ else
   collection='puppet'
 fi
 
-if [[ "$collection" == "puppetcore"* && -z "$password" ]]; then
+if [[ "$collection" != puppetcore*-nightly && "$collection" == "puppetcore"* && -z "$password" ]]; then
   echo "A password parameter is required to install from puppetcore"
   exit 1
 fi
 
 if [ -n "$PT_yum_source" ]; then
   yum_source=$PT_yum_source
+elif [[ "$collection" == puppetcore*-nightly ]]; then
+  yum_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum'
 elif [[ "$collection" == "puppetcore"* ]]; then
   yum_source='https://yum-puppetcore.puppet.com/public'
 elif [ "$nightly" = true ]; then
-  yum_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum'
+  yum_source='http://nightlies.puppet.com/yum'
 else
   yum_source='http://yum.puppet.com'
 fi
 
 if [ -n "$PT_apt_source" ]; then
   apt_source=$PT_apt_source
+elif [[ "$collection" == puppetcore*-nightly ]]; then
+  apt_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt'
 elif [[ "$collection" == "puppetcore"* ]]; then
   apt_source='https://apt-puppetcore.puppet.com/public'
 elif [ "$nightly" = true ]; then
@@ -150,6 +154,9 @@ fi
 
 if [ -n "$PT_mac_source" ]; then
   mac_source=$PT_mac_source
+
+elif [[ "$collection" == puppetcore*-nightly ]]; then
+  mac_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads'
 elif [[ "$collection" == "puppetcore"* ]]; then
   mac_source='https://artifacts-puppetcore.puppet.com/v1/download'
 elif [ "$nightly" = true ]; then