diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst
index 3d32de0841..57a9cad189 100644
--- a/lib/spack/docs/containers.rst
+++ b/lib/spack/docs/containers.rst
@@ -129,6 +129,9 @@ are currently supported are summarized in the table below:
    * - CentOS 7
      - ``centos:7``
      - ``spack/centos7``
+   * - openSUSE Leap
+     - ``opensuse/leap``
+     - ``spack/leap15``
 
 All the images are tagged with the corresponding release of Spack:
 
diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json
index ee4e5a2caa..8e42329725 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -28,6 +28,19 @@
         "develop": "latest"
       }
     },
+    "leap:15": {
+      "bootstrap": {
+        "template": "container/leap15.dockerfile"
+      },
+      "os_package_manager": "zypper",
+      "build": "spack/leap15",
+      "build_tags": {
+        "develop": "latest"
+      },
+      "final": {
+        "image": "opensuse/leap:latest"
+      }
+    },
     "nvidia/cuda:11.2.1": {
       "bootstrap": {
         "template": "container/cuda_11_2_1.dockerfile",
@@ -85,6 +98,11 @@
       "update": "yum update -y && amazon-linux-extras install epel -y",
       "install": "yum install -y",
       "clean": "rm -rf /var/cache/yum  && yum clean all"
+    },
+    "zypper": {
+      "update": "zypper update -y",
+      "install": "zypper install -y",
+      "clean": "rm -rf /var/cache/zypp  && zypper clean -a"
     }
   }
 }
diff --git a/share/spack/docker/leap-15.dockerfile b/share/spack/docker/leap-15.dockerfile
index 65375c359b..eeaf90f524 100644
--- a/share/spack/docker/leap-15.dockerfile
+++ b/share/spack/docker/leap-15.dockerfile
@@ -2,7 +2,7 @@ FROM opensuse/leap:15.3
 MAINTAINER Christian Goll <cgoll@suse.com>
 
 ENV DOCKERFILE_BASE=opensuse          \
-    DOCKERFILE_DISTRO=opensuse_leap   \
+    DOCKERFILE_DISTRO=leap   \
     DOCKERFILE_DISTRO_VERSION=15.3    \
     SPACK_ROOT=/opt/spack      \
     DEBIAN_FRONTEND=noninteractive    \