diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json
index 0504732..c6cdacc 100644
--- a/openshift/templates/django-postgresql.json
+++ b/openshift/templates/django-postgresql.json
@@ -193,7 +193,12 @@
                     "name": "DJANGO_SECRET_KEY",
                     "value": "${DJANGO_SECRET_KEY}"
                   }
-                ]
+                ],
+                "resources": {
+		      "limits": {
+			  "memory": "${MEMORY_LIMIT}"
+		      }
+                }
               }
             ]
           }
@@ -288,7 +293,12 @@
                     "name": "POSTGRESQL_DATABASE",
                     "value": "${DATABASE_NAME}"
                   }
-                ]
+                ],
+                "resources": {
+		      "limits": {
+			  "memory": "${MEMORY_POSTGRESQL_LIMIT}"
+		      }
+                }
               }
             ]
           }
@@ -297,62 +307,86 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the Django container can use",
+      "value": "128Mi"
+    },
+    {
+      "name": "MEMORY_POSTGRESQL_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the PostgreSQL container can use",
+      "value": "128Mi"
+    },
     {
       "name": "SOURCE_REPOSITORY_URL",
+      "displayName": "Source repository URL",
       "description": "The URL of the repository with your application source code",
       "value": "https://github.com/openshift/django-ex.git"
     },
     {
       "name": "SOURCE_REPOSITORY_REF",
+      "displayName": "Source repository reference",
       "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"
     },
     {
       "name": "CONTEXT_DIR",
+      "displayName": "Context directory",
       "description": "Set this to the relative path to your project if it is not in the root of your repository"
     },
     {
       "name": "APPLICATION_DOMAIN",
+      "displayName": "Application hostname",
       "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
       "value": ""
     },
     {
       "name": "GITHUB_WEBHOOK_SECRET",
+      "displayName": "GitHub webhook secret",
       "description": "A secret string used to configure the GitHub webhook",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{40}"
     },
     {
       "name": "DATABASE_SERVICE_NAME",
+      "displayName": "Database service name",
       "description": "Database service name",
       "value": "postgresql"
     },
     {
       "name": "DATABASE_ENGINE",
+      "displayName": "Database engine",
       "description": "Database engine: postgresql, mysql or sqlite (default)",
       "value": "postgresql"
     },
     {
       "name": "DATABASE_NAME",
+      "displayName": "Database name",
       "description": "Database name",
       "value": "default"
     },
     {
       "name": "DATABASE_USER",
+      "displayName": "Database user name",
       "description": "Database user name",
       "value": "django"
     },
     {
       "name": "DATABASE_PASSWORD",
+      "displayName": "Database user password",
       "description": "Database user password",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}"
     },
     {
       "name": "APP_CONFIG",
+      "displayName": "Application configuration file path",
       "description": "Relative path to Gunicorn configuration file (optional)"
     },
     {
       "name": "DJANGO_SECRET_KEY",
+      "displayName": "Djange secret key",
       "description": "Set this to a long random string",
       "generate": "expression",
       "from": "[\\w]{50}"
diff --git a/openshift/templates/django.json b/openshift/templates/django.json
index 07ba833..8936091 100644
--- a/openshift/templates/django.json
+++ b/openshift/templates/django.json
@@ -193,7 +193,12 @@
                     "name": "DJANGO_SECRET_KEY",
                     "value": "${DJANGO_SECRET_KEY}"
                   }
-                ]
+                ],
+                "resources": {
+		      "limits": {
+			  "memory": "${MEMORY_LIMIT}"
+		      }
+                }
               }
             ]
           }
@@ -202,56 +207,74 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "128Mi"
+    },
     {
       "name": "SOURCE_REPOSITORY_URL",
+      "displayName": "Source repository URL",
       "description": "The URL of the repository with your application source code",
       "value": "https://github.com/openshift/django-ex.git"
     },
     {
       "name": "SOURCE_REPOSITORY_REF",
+      "displayName": "Source repository reference",
       "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"
     },
     {
       "name": "CONTEXT_DIR",
+      "displayName": "Context directory",
       "description": "Set this to the relative path to your project if it is not in the root of your repository"
     },
     {
       "name": "APPLICATION_DOMAIN",
+      "displayName": "Application hostname",
       "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
       "value": ""
     },
     {
       "name": "GITHUB_WEBHOOK_SECRET",
+      "displayName": "GitHub webhook secret",
       "description": "A secret string used to configure the GitHub webhook",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{40}"
     },
     {
       "name": "DATABASE_SERVICE_NAME",
+      "displayName": "Database service name",
       "description": "Database service name"
     },
     {
       "name": "DATABASE_ENGINE",
+      "displayName": "Database engine",
       "description": "Database engine: postgresql, mysql or sqlite (default)"
     },
     {
       "name": "DATABASE_NAME",
+      "displayName": "Database name",
       "description": "Database name"
     },
     {
       "name": "DATABASE_USER",
+      "displayName": "Database user name",
       "description": "Database user name"
     },
     {
       "name": "DATABASE_PASSWORD",
+      "displayName": "Database user password",
       "description": "Database user password"
     },
     {
       "name": "APP_CONFIG",
+      "displayName": "Application configuration file path",
       "description": "Relative path to Gunicorn configuration file (optional)"
     },
     {
       "name": "DJANGO_SECRET_KEY",
+      "displayName": "Djange secret key",
       "description": "Set this to a long random string",
       "generate": "expression",
       "from": "[\\w]{50}"