diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce2f8c9a5c..3ebc93224a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -123,8 +123,8 @@ workflows:
                 dockerfile: Dockerfile
                 extra-build-args: "--target phraseanet-fpm"
                 region: AWS_DEFAULT_REGION
-                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
-                tag: "alpha-0.1"
+                repo: "phraseanet-fpm"
+                tag: "${CIRCLE_BRANCH}"
             - aws-ecr/build_and_push_image:
                 account-url: AWS_ACCOUNT_URL
                 aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -134,8 +134,8 @@ workflows:
                 dockerfile: Dockerfile
                 extra-build-args: "--target phraseanet-nginx"
                 region: AWS_DEFAULT_REGION
-                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx"
-                tag: "alpha-0.1"
+                repo: "phraseanet-nginx"
+                tag: "${CIRCLE_BRANCH}"
             - aws-ecr/build_and_push_image:
                 account-url: AWS_ACCOUNT_URL
                 aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -145,5 +145,5 @@ workflows:
                 dockerfile: Dockerfile
                 extra-build-args: "--target phraseanet-worker"
                 region: AWS_DEFAULT_REGION
-                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
-                tag: "alpha-0.1"
+                repo: "phraseanet-worker"
+                tag: "${CIRCLE_BRANCH}"
diff --git a/README.md b/README.md
index 751efed810..0105de60fa 100644
--- a/README.md
+++ b/README.md
@@ -72,3 +72,7 @@ It will build and tag the following images :
     local/phraseanet-worker:<TAG>
     local/phraseanet-fpm:<TAG>
     local/phraseanet-nginx:<TAG>
+
+# Deploy the application
+
+Once the images are built, you can deploy the entire phraseanet stack using the repository : https://github.com/alchemy-fr/phraseanet-docker and follow the instruction inside its `README.md` file.
diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml
index 31e874a13d..eae43d5461 100644
--- a/lib/conf.d/data_templates/DublinCore.xml
+++ b/lib/conf.d/data_templates/DublinCore.xml
@@ -79,7 +79,7 @@
                 <size>748</size>
                 <mediatype>video</mediatype>
                 <writeDatas>yes</writeDatas>
-                <acodec>libfaac</acodec>
+                <acodec>libmp3lame</acodec>
                 <vcodec>libx264</vcodec>
                 <devices>screen</devices>
                 <bitrate>1000</bitrate>
diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml
index 5c5b10910d..44b0afa69f 100644
--- a/lib/conf.d/data_templates/en-simple.xml
+++ b/lib/conf.d/data_templates/en-simple.xml
@@ -79,7 +79,7 @@
                 <size>748</size>
                 <mediatype>video</mediatype>
                 <writeDatas>yes</writeDatas>
-                <acodec>libfaac</acodec>
+                <acodec>libmp3lame</acodec>
                 <vcodec>libx264</vcodec>
                 <devices>screen</devices>
                 <bitrate>1000</bitrate>
diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml
index 49ab36b98d..cc0a2b582c 100644
--- a/lib/conf.d/data_templates/fr-simple.xml
+++ b/lib/conf.d/data_templates/fr-simple.xml
@@ -79,7 +79,7 @@
                 <size>748</size>
                 <mediatype>video</mediatype>
                 <writeDatas>yes</writeDatas>
-                <acodec>libfaac</acodec>
+                <acodec>libmp3lame</acodec>
                 <vcodec>libx264</vcodec>
                 <devices>screen</devices>
                 <bitrate>1000</bitrate>