diff --git a/upload2openstack.sh b/upload2openstack.sh
index c5fe700bebc0286a4aea6b476c14972f600b0f55..a723c5682a2199ae838222908b4502b521031467 100755
--- a/upload2openstack.sh
+++ b/upload2openstack.sh
@@ -4,7 +4,7 @@
 
 function usage {
  echo "`basename $0` major test {archs} {date} {rel}"
- echo "         major = 5,6,7,rhel6,rhel7"
+ echo "         major = 5,6,7,rhel6,rhel7,rhel8"
  echo "         test = test/prod"
  echo "         arch = x86_64 i686"
  echo "         date = YYYYMMDD"
@@ -58,14 +58,21 @@ case $VER in
      os_distro="RHEL"
      os_distro_major="6"
      os_distro_minor="9"
-     IMGPREFIX="rhel-server-6.9"
+     IMGPREFIX="rhel-server-${os_distro_major}.${os_distro_minor}"
     ;;
     rhel7)
      [ x$ARCHS == "x" ] && ARCHS="x86_64"
      os_distro="RHEL"
      os_distro_major="7"
      os_distro_minor="6"
-     IMGPREFIX="rhel-server-7.6"
+     IMGPREFIX="rhel-server-${os_distro_major}.${os_distro_minor}"
+    ;;
+    rhel8)
+     [ x$ARCHS == "x" ] && ARCHS="x86_64"
+     os_distro="RHEL"
+     os_distro_major="8"
+     os_distro_minor="0"
+     IMGPREFIX="rhel-server-${os_distro_major}.${os_distro_minor}"
     ;;
 esac