diff --git a/.editorconfig b/.editorconfig
index 26140706..6a9a5c45 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,css,scss,json,yml}]
+[*.{html,css,scss,json,yml,xml}]
 indent_style = space
 indent_size = 2
 
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 61b75949..50fcbea2 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -61,6 +61,10 @@ def remove_docker_files():
     file_names = ["local.yml", "production.yml", ".dockerignore"]
     for file_name in file_names:
         os.remove(file_name)
+    if "{{ cookiecutter.use_pycharm }}".lower() == "y":
+        file_names = ["docker_compose_up_django.xml", "docker_compose_up_docs.xml"]
+        for file_name in file_names:
+            os.remove(os.path.join(".idea", "runConfigurations", file_name))
 
 
 def remove_utility_files():
diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig
index 26140706..6a9a5c45 100644
--- a/{{cookiecutter.project_slug}}/.editorconfig
+++ b/{{cookiecutter.project_slug}}/.editorconfig
@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,css,scss,json,yml}]
+[*.{html,css,scss,json,yml,xml}]
 indent_style = space
 indent_size = 2
 
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
new file mode 100644
index 00000000..67f369a3
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration name="docker-compose up django" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value=""/>
+        <option name="services">
+          <list>
+            <option value="django"/>
+            {%- if cookiecutter.use_celery == 'y' %}
+            <option value="celeryworker"/>
+            <option value="celerybeat"/>
+            {%- endif %}
+            {%- if cookiecutter.js_task_runner == 'Gulp' %}
+            <option value="node"/>
+            {%- endif %}
+          </list>
+        </option>
+        <option name="sourceFilePath" value="local.yml"/>
+      </settings>
+    </deployment>
+    <method v="2"/>
+  </configuration>
+</component>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml
new file mode 100644
index 00000000..0f77b28d
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration name="docker-compose up docs" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value=""/>
+        <option name="services">
+          <list>
+            <option value="docs"/>
+          </list>
+        </option>
+        <option name="sourceFilePath" value="local.yml"/>
+      </settings>
+    </deployment>
+    <method v="2"/>
+  </configuration>
+</component>