diff --git a/playbooks/install.py b/playbooks/install.py
index 8eacb407..043427c6 100644
--- a/playbooks/install.py
+++ b/playbooks/install.py
@@ -404,6 +404,11 @@ def parse_commandline_args():
 		help=argparse.SUPPRESS
 	)
 
+	# LXC Support
+	parser.add_argument('--container', dest='container', default=False, action='store_true',
+		help='Use if you\'re creating inside LXC'
+	)
+
 	args = parser.parse_args()
 
 	return args
diff --git a/playbooks/site.yml b/playbooks/site.yml
index 26ea0ea5..328cfcba 100644
--- a/playbooks/site.yml
+++ b/playbooks/site.yml
@@ -5,22 +5,22 @@
   become: yes
   become_user: root
   roles:
-    - { role: common,            tags: common                             }
-    - { role: locale,            tags: locale                             }
-    - { role: mariadb,           tags: mariadb                            }
-    - { role: nodejs,            tags: nodejs                             }
-    - { role: swap,              tags: swap,             when: production }
-    - { role: logwatch,          tags: logwatch,         when: production }
-    - { role: bash_screen_wall,  tags: bash_screen_wall, when: production }
-    - { role: frappe_selinux,    tags: frappe_selinux,   when: production }
-    - { role: dns_caching,       tags: dns_caching,      when: production }
-    - { role: ntpd,              tags: ntpd,             when: production }
-    - { role: wkhtmltopdf,       tags: wkhtmltopdf                        }
-    - { role: psutil,            tags: psutil                             }
-    - { role: redis,             tags: redis                              }
-    - { role: supervisor,        tags: supervisor,       when: production }
-    - { role: nginx,             tags: nginx,            when: production }
-    - { role: fail2ban,          tags: fail2ban,         when: production }
+    - { role: common,            tags: common                                               }
+    - { role: locale,            tags: locale                                               }
+    - { role: mariadb,           tags: mariadb                                              }
+    - { role: nodejs,            tags: nodejs                                               }
+    - { role: swap,              tags: swap,             when: production and not container }
+    - { role: logwatch,          tags: logwatch,         when: production                   }
+    - { role: bash_screen_wall,  tags: bash_screen_wall, when: production                   }
+    - { role: frappe_selinux,    tags: frappe_selinux,   when: production                   }
+    - { role: dns_caching,       tags: dns_caching,      when: production                   }
+    - { role: ntpd,              tags: ntpd,             when: production                   }
+    - { role: wkhtmltopdf,       tags: wkhtmltopdf                                          }
+    - { role: psutil,            tags: psutil                                               }
+    - { role: redis,             tags: redis                                                }
+    - { role: supervisor,        tags: supervisor,       when: production                   }
+    - { role: nginx,             tags: nginx,            when: production                   }
+    - { role: fail2ban,          tags: fail2ban,         when: production                   }
   tasks:
     - name: Set hostname
       hostname: name='{{ hostname }}'