diff --git a/base-runtime.yaml b/base-runtime.yaml
index cd64e84..cb93b6c 100644
--- a/base-runtime.yaml
+++ b/base-runtime.yaml
@@ -19,7 +19,7 @@ data:
         documentation: https://github.com/fedora-modularity/base-runtime
         tracker: https://github.com/fedora-modularity/base-runtime/issues
     profiles:
-        baseimage:
+        container:
             rpms:
                 - bash
                 - coreutils-single
diff --git a/tests/config.yaml b/tests/config.yaml
index d939680..bec9dbb 100644
--- a/tests/config.yaml
+++ b/tests/config.yaml
@@ -6,7 +6,7 @@ service:
     port:
 packages:
     profiles:
-        - baseimage
+        - container
     rpms:
 default_module: docker
 module:
diff --git a/tests/setup.py b/tests/setup.py
index 13a6af0..0f491da 100755
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -64,12 +64,12 @@ class BaseRuntimeSetupDocker(module_framework.CommonFunctions, Test):
         if "profiles" not in mod_yaml["data"].keys():
             self.error("'profiles' key was not found in 'data' section")
 
-        if "baseimage" not in mod_yaml["data"]["profiles"].keys():
-            self.error("'baseimage' key was not found in 'profiles' section")
+        if "container" not in mod_yaml["data"]["profiles"].keys():
+            self.error("'container' key was not found in 'profiles' section")
 
-        base_profile = mod_yaml["data"]["profiles"]["baseimage"]
+        base_profile = mod_yaml["data"]["profiles"]["container"]
         if "rpms" not in base_profile.keys():
-            self.error("'rpms' key was not found in 'baseimage' profile")
+            self.error("'rpms' key was not found in 'container' profile")
 
         req_pkgs = base_profile["rpms"]
         if not req_pkgs:
diff --git a/tests/smoke.py b/tests/smoke.py
index 6b8a5a0..d643bdf 100644
--- a/tests/smoke.py
+++ b/tests/smoke.py
@@ -90,16 +90,16 @@ class BaseRuntimeSmokeTest(module_framework.AvocadoTest):
         if "profiles" not in mod_yaml["data"].keys():
             self.error("'profiles' key was not found in 'data' section")
 
-        if "baseimage" not in mod_yaml["data"]["profiles"].keys():
-            self.error("'baseimage' key was not found in 'profiles' section")
+        if "container" not in mod_yaml["data"]["profiles"].keys():
+            self.error("'container' key was not found in 'profiles' section")
 
-        base_profile = mod_yaml["data"]["profiles"]["baseimage"]
+        base_profile = mod_yaml["data"]["profiles"]["container"]
         if "rpms" not in base_profile.keys():
-            self.error("'rpms' key was not found in 'baseimage' profile")
+            self.error("'rpms' key was not found in 'container' profile")
 
         req_pkgs = base_profile["rpms"]
         if not req_pkgs:
-            self.error("No rpm is defined for baseimage")
+            self.error("No rpm is defined for container")
 
         installed_pkgs = self._get_all_installed_pkgs()