diff --git a/.github/workflows/maven-build-pr-check.yml b/.github/workflows/build-pr-check.yml
similarity index 89%
rename from .github/workflows/maven-build-pr-check.yml
rename to .github/workflows/build-pr-check.yml
index 67df1f7d94..9c0c9d887e 100644
--- a/.github/workflows/maven-build-pr-check.yml
+++ b/.github/workflows/build-pr-check.yml
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+    - name: Check all properties have description
+      run: ./check_properties_description.sh
     - name: Cache local Maven repository
       uses: actions/cache@v2
       with:
diff --git a/check_properties_description.sh b/check_properties_description.sh
new file mode 100755
index 0000000000..831896b5ad
--- /dev/null
+++ b/check_properties_description.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+CHE_PROPERTIES_PATH="assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties"
+MULTIUSER_PROPERTIES_PATH="assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/multiuser.properties"
+
+HAS_DESCRIPTION=false
+cat $CHE_PROPERTIES_PATH $MULTIUSER_PROPERTIES_PATH |
+while read -r LINE
+do
+  if [[ $LINE == '#'* ]]; then
+    HAS_DESCRIPTION=true
+  elif [[ -z $LINE ]]; then
+    HAS_DESCRIPTION=false
+  else
+    if [[ $HAS_DESCRIPTION == false ]]; then
+      echo "Property $LINE seems to be missing a description!"
+      exit 1
+    fi
+    HAS_DESCRIPTION=false
+  fi
+done
+