diff --git a/README.md b/README.md
index 18ffabfc..fa4aa9e6 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,18 @@ The VOMS Admin service is a web application providing tools for administering
 the VOMS VO structure. It provides an intuitive web user interface for daily
 administration tasks.
 
-## Build instructions
+## Build with Maven
 
-You will need maven 3 to build this project.
+Requirements:
 
-  mvn package
+- Java 6
+- Maven 3
+
+Build it with the following command:
 
-will build the artifacts.
+  mvn package
 
-### Eclipse import instructions
+## Eclipse import instructions
 
 To import the project in Eclipse for development, do as follows:
 
@@ -28,7 +31,21 @@ To import the project in Eclipse for development, do as follows:
 From Eclipse menu, select “Import Existing Maven projects...”, and
 point it to this project root directory.
 
+## Dockerized development environment
+
+Reauirements:
+
+- Docker >= v.1.5.0
+- Fig >= 1.0.1
+
+Running
+
+  fig up
+
+Will setup a running voms-admin-server instance, running a single VO named test.
 
 ## RPM package build
 
 See README.md in ./package/rpm directory.
+
+
diff --git a/fig.yml b/fig.yml
new file mode 100644
index 00000000..6c11d530
--- /dev/null
+++ b/fig.yml
@@ -0,0 +1,55 @@
+conf:
+  image: busybox
+  volumes:
+    - /etc/voms-admin
+  command: true
+
+data:
+  image: busybox
+  volumes:
+    - /var/lib/mysql
+  command: true
+
+db:
+  image: mariadb:latest
+  ports:
+    - "3306"
+  volumes_from:
+    - data
+
+  environment:
+    MYSQL_ROOT_PASSWORD: pwd
+    MYSQL_USER: voms
+    MYSQL_PASSWORD: pwd
+    MYSQL_DATABASE: voms_test
+
+mail:
+  image: jlynn/python-smtp
+  ports:
+    - "25"
+
+adminserver:
+  image: italiangrid/voms-admin-server
+  hostname: dev
+  domainname: local.io
+  volumes:
+      - .:/code:ro
+      - ~/.jrebel:/home/voms/.jrebel:rw
+      - ~/jrebel:/jrebel:ro
+      - /var/log/voms-admin
+  volumes_from:
+      - conf
+      - data
+  ports:
+      - "8443:8443"
+      - "1044:1044"
+  links:
+      - db
+      - mail
+
+  environment:
+    MAILHOST: mail
+    MYSQL_ROOT_PASSWORD: pwd
+    ENABLE_JREBEL: y
+    # VOMS_JAVA_OPTS: -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=1044,suspend=n
+    # VOMS_SKIP_CONFIGURE: y
diff --git a/pom.xml b/pom.xml
index 90ecd8b9..c0790732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
     <commons-cli.version>1.1</commons-cli.version>
     <license-plugin.version>1.9.0</license-plugin.version>
     <log.dir>var/log/voms-admin</log.dir>
-    
-    <voms.source.prefix>/opt/voms-admin</voms.source.prefix>
+
+    <voms.source.prefix>/code</voms.source.prefix>
   </properties>
 
   <dependencyManagement>
@@ -184,7 +184,7 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <!-- 
+      <!--
       <plugin>
         <groupId>org.zeroturnaround</groupId>
         <artifactId>jrebel-maven-plugin</artifactId>
@@ -201,7 +201,7 @@
       </plugin>
        -->
       <plugin>
-      
+
         <inherited>true</inherited>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
diff --git a/voms-admin-server/src/config/logback.container.xml b/voms-admin-server/src/config/logback.container.xml
index 0d773bb7..c84696c6 100644
--- a/voms-admin-server/src/config/logback.container.xml
+++ b/voms-admin-server/src/config/logback.container.xml
@@ -21,43 +21,42 @@
 
 -->
 
-<configuration>    
-
-    <logger name="org.eclipse.jetty" level="ERROR" />
-    
-    <appender name="FILE"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${package.prefix}/${log.dir}/server.log</File>
-        <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${package.prefix}/${log.dir}/server-%d{yyyy-MM-dd}.log</FileNamePattern>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS'Z',UTC} - %level [%logger{0}] - %msg%n</pattern>
-        </encoder>
-    </appender>
-    
-    <appender name="AUTHN"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${package.prefix}/${log.dir}/server-authn.log</File>
-        <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${package.prefix}/${log.dir}/server-authn-%d{yyyy-MM-dd}.log</FileNamePattern>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS'Z',UTC} - %level [%logger{0}] - %msg%n</pattern>
-        </encoder>
-    </appender>
-    
-    
-    <logger name="org.italiangrid.utils.https.impl.canl.CANLListener" level="INFO" additivity="false">
-       <appender-ref ref="AUTHN" />
-    </logger>
-    
-    <root level="INFO">
-        <appender-ref ref="FILE" />
-    </root>
-    
-</configuration>
\ No newline at end of file
+<configuration scan="true">
+
+  <logger name="org.eclipse.jetty" level="ERROR" />
+
+  <appender name="FILE"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <File>${package.prefix}/${log.dir}/server.log</File>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <FileNamePattern>${package.prefix}/${log.dir}/server-%d{yyyy-MM-dd}.log</FileNamePattern>
+    </rollingPolicy>
+
+    <encoder>
+      <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS'Z',UTC} - %level [%logger{0}] - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="AUTHN"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <File>${package.prefix}/${log.dir}/server-authn.log</File>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <FileNamePattern>${package.prefix}/${log.dir}/server-authn-%d{yyyy-MM-dd}.log</FileNamePattern>
+    </rollingPolicy>
+
+    <encoder>
+      <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS'Z',UTC} - %level [%logger{0}] - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.italiangrid.utils.https.impl.canl.CANLListener" level="INFO" additivity="false">
+    <appender-ref ref="AUTHN" />
+  </logger>
+
+  <root level="INFO">
+    <appender-ref ref="FILE" />
+  </root>
+
+</configuration>
diff --git a/voms-container/src/main/resources/logback.xml b/voms-container/src/main/resources/logback.xml
index 07e945ef..447c1c6b 100644
--- a/voms-container/src/main/resources/logback.xml
+++ b/voms-container/src/main/resources/logback.xml
@@ -21,10 +21,9 @@
 
 -->
 
-<configuration>    
+<configuration scan="true">
 
     <logger name="org.eclipse.jetty" level="ERROR" />
-        
     <!-- NORMALLY YOU SHOULD NOT EDIT BELOW THIS POINT  -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -35,5 +34,5 @@
     <root level="INFO">
         <appender-ref ref="CONSOLE" />
     </root>
-    
+
 </configuration>