diff --git a/passbook/policies/expression/templates/policy/expression/form.html b/passbook/policies/expression/templates/policy/expression/form.html
index 9a8a063c6..65274b195 100644
--- a/passbook/policies/expression/templates/policy/expression/form.html
+++ b/passbook/policies/expression/templates/policy/expression/form.html
@@ -3,10 +3,9 @@
 {% load i18n %}
 
 {% block beneath_form %}
-<div class="form-group ">
-    <label class="col-sm-2 control-label" for="friendly_name-2">
-    </label>
-    <div class="col-sm-10">
+<div class="pf-c-form__group ">
+    <label for="" class="pf-c-form__label"></label>
+    <div class="c-form__horizontal-group">
         <p>
             Expression using <a href="https://jinja.palletsprojects.com/en/2.11.x/templates/">Jinja</a>. Following variables are available:
         </p>
diff --git a/passbook/providers/saml/templates/saml/idp/property_mapping_form.html b/passbook/providers/saml/templates/saml/idp/property_mapping_form.html
index 43ff158ff..4a3843ddd 100644
--- a/passbook/providers/saml/templates/saml/idp/property_mapping_form.html
+++ b/passbook/providers/saml/templates/saml/idp/property_mapping_form.html
@@ -3,10 +3,9 @@
 {% load i18n %}
 
 {% block beneath_form %}
-<div class="form-group ">
-    <label class="col-sm-2 control-label" for="friendly_name-2">
-    </label>
-    <div class="col-sm-10">
+<div class="pf-c-form__group ">
+    <label for="" class="pf-c-form__label"></label>
+    <div class="c-form__horizontal-group">
         <p>
             Expression using <a href="https://jinja.palletsprojects.com/en/2.11.x/templates/">Jinja</a>. Following variables are available:
             <ul>
diff --git a/passbook/sources/ldap/templates/ldap/property_mapping_form.html b/passbook/sources/ldap/templates/ldap/property_mapping_form.html
index ff41588ed..03203b89c 100644
--- a/passbook/sources/ldap/templates/ldap/property_mapping_form.html
+++ b/passbook/sources/ldap/templates/ldap/property_mapping_form.html
@@ -3,10 +3,9 @@
 {% load i18n %}
 
 {% block beneath_form %}
-<div class="form-group ">
-    <label class="col-sm-2 control-label" for="friendly_name-2">
-    </label>
-    <div class="col-sm-10">
+<div class="pf-c-form__group ">
+    <label for="" class="pf-c-form__label"></label>
+    <div class="c-form__horizontal-group">
         <p>
             Expression using <a href="https://jinja.palletsprojects.com/en/2.11.x/templates/">Jinja</a>. Following variables are available:
             <ul>