diff --git a/doc/source/configure-swift-add.rst b/doc/source/configure-swift-add.rst
index 54a82011..96534bca 100644
--- a/doc/source/configure-swift-add.rst
+++ b/doc/source/configure-swift-add.rst
@@ -19,8 +19,8 @@ existing deployment.
    to swift.
 
    If this value is ``False``, by default only users with the
-   ``admin`` or ``swiftoperator`` role can create containers or
-   manage tenants.
+   ``admin`` role or role set in ``swift_operator_role`` can create
+   containers or manage tenants.
 
    When the backend type for the glance is set to
    ``swift``, glance can access the swift cluster
diff --git a/doc/source/configure-swift.rst b/doc/source/configure-swift.rst
index dd246370..987d8984 100644
--- a/doc/source/configure-swift.rst
+++ b/doc/source/configure-swift.rst
@@ -34,8 +34,8 @@ usage.
    to Object Storage.
 
    If this value is ``False``, then by default, only users with the
-   admin or ``swiftoperator`` role are allowed to create containers or
-   manage tenants.
+   admin role or role set in ``swift_operator_role`` are allowed to
+   create containers or manage tenants.
 
    When the backend type for the Image Service (glance) is set to
    ``swift``, glance can access the swift cluster
diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2
index bd80be8e..9dfc3631 100644
--- a/templates/proxy-server.conf.j2
+++ b/templates/proxy-server.conf.j2
@@ -85,15 +85,15 @@ memcache_secret_key = {{ memcached_encryption_key }}
 use = egg:swift#keystoneauth
 {% if swift_allow_all_users is defined and swift_allow_all_users == True %}
 {% if 'ceilometer' in swift_middleware_list %}
-operator_roles = admin, swiftoperator, _member_, {{ swift_reselleradmin_role }}
+operator_roles = admin, {{ swift_operator_role }}, _member_, {{ swift_reselleradmin_role }}
 {% else %}
-operator_roles = admin, swiftoperator, _member_
+operator_roles = admin, {{ swift_operator_role }}, _member_
 {% endif %}
 {% else %}
 {% if 'ceilometer' in swift_middleware_list %}
-operator_roles = admin, swiftoperator, {{ swift_reselleradmin_role }}
+operator_roles = admin, {{ swift_operator_role }}, {{ swift_reselleradmin_role }}
 {% else %}
-operator_roles = admin, swiftoperator
+operator_roles = admin, {{ swift_operator_role }}
 {% endif %}
 {% endif %}
 # The reseller admin role has the ability to create and delete accounts