diff --git a/dist.py b/dist.py
index 8dddde098923a1e87c5f8024c9b90000316adcd1..a0a724b84a8898f87094adce12b6bd305a0657d7 100644
--- a/dist.py
+++ b/dist.py
@@ -18,17 +18,22 @@ title = os.environ.get("CI_PROJECT_TITLE")
 author = os.environ.get("PROJECT_AUTHOR")
 description = os.environ.get("CI_PROJECT_DESCRIPTION")
 download_url = os.environ.get("CI_PROJECT_URL")
-min_required = os.environ.get("CMK_MIN_REQUIRED")
-usable_until = os.environ.get("CMK_USABLE_UNTIL")
 
-dist({
+dist_dict = {
     'name': name,
     'title': title,
     'author': author,
     'description': description,
     'download_url': download_url,
     'version': version,
-    'version.min_required': min_required,
-    'version.usable_until': usable_until,
     'version.packaged': 'python-mkp',
-})
+}
+
+if os.environ.get("CMK_MIN_REQUIRED"):
+    dist_dict['version.min_required'] = os.environ.get("CMK_MIN_REQUIRED")
+
+if os.environ.get("CMK_USABLE_UNTIL"):
+    dist_dict['version.usable_until'] = os.environ.get("CMK_USABLE_UNTIL")
+
+
+dist(dist_dict)