diff --git a/.gitignore b/.gitignore
index 0174487..a8e24a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,55 +1,74 @@
+
+!catalog-fe/src/main/webapp/META-INF/
+!catalog-fe/src/main/webapp/WEB-INF/
 # Eclipse
+# Maven
+# Package Files #
+## sdc-os-chef
+*.class
+*.ear
+*.iml
+*.jar
+*.kpf
+*.orig
+*.war
 .classpath
+.delivery
+.idea/*
+.metadata/
+.metadata/*
 .project
 .settings/
-
-# Maven
-log/
-target/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# Other
-*.kpf
-*.class
-*.orig
+Vagrantfile
+a4c/
+asdc-chef/cookbooks/Deploy-SDandC/attributes/version.rb
+asdc-tests/ExtentReport/ASDC_CI_Extent_Report.html
+asdc-tests/test-output/**
+asdctool/tosca/*
+bin/
+catalog-be/.pydevproject
+catalog-be/.checkstyle
+catalog-be/.pydevproject
+catalog-be/bin/
+catalog-be/data/*
+catalog-be/src/main/java/META-INF/MANIFEST.MF
+catalog-be/test-output/*
+catalog-builders/bin/
+catalog-dao/bin/
+catalog-fe/bin
+catalog-fe/src/main/webapp/*
+catalog-ui/*.tmp.txt
 catalog-ui/.*
-catalog-ui/app/scripts/tsconfig.json
-catalog-ui/app/scripts/references.ts
-catalog-ui/app/scripts/**/*.js
-catalog-ui/app/scripts/**/*.js.map
-
-# catalog-ui
-catalog-ui/app/**/*.css
 catalog-ui/.editorconfig
 catalog-ui/.jshintrc
 catalog-ui/.yo-rc.json
+catalog-ui/Chrome*
+catalog-ui/PhantomJS_1.9.8_(Windows_7_0.0.0)/*
+catalog-ui/app/**/*.css
+catalog-ui/app/dist/*
 catalog-ui/app/robots.txt
-catalog-ui/node_modules/
-catalog-ui/bower_components/
+catalog-ui/app/scripts/**/*.js
+catalog-ui/app/scripts/**/*.js.map
+catalog-ui/app/scripts/references.ts
+catalog-ui/app/scripts/tsconfig.json
 catalog-ui/app/tsconfig.json
-
-
-catalog-be/.checkstyle
-catalog-be/bin/
-catalog-be/src/main/java/META-INF/MANIFEST.MF
-a4c/
-catalog-ui/*.tmp.txt
-catalog-dao/bin/
+catalog-ui/bower_components/
 catalog-ui/dist
-catalog-builders/bin/
+catalog-ui/node/*
+catalog-ui/node_modules/
+catalog-ui/npm-debug.log
+catalog-ui/tests/Coverage/*
 common-app-api/bin/
+common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml
+common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/logs/*
 data/compute.png
 data/loadbalancer.png
 data/mysql.png
 data/network.png
+data/normative-types-DBMS.yml
 data/normative-types-blockStorage.yml
 data/normative-types-compute.yml
 data/normative-types-database.yml
-data/normative-types-DBMS.yml
 data/normative-types-network.yml
 data/normative-types-objectStorage.yml
 data/normative-types-root.yml
@@ -62,19 +81,6 @@
 data/router.png
 data/software.png
 data/volume.png
-catalog-ui/app/dist/*
-catalog-fe/src/main/webapp/*
-catalog-fe/bin
-!catalog-fe/src/main/webapp/WEB-INF/
-!catalog-fe/src/main/webapp/META-INF/
-ui-ci/.tern-project
-catalog-be/data/*
-.metadata/*
-.metadata/*
-.idea/*
-*.iml
-catalog-ui/npm-debug.log
-sdnc-tests/logs/wordnik.log
 distribution-ci/logs/wordnik.log
 distribution-ci/logs/wordnik.log.1
 distribution-ci/logs/wordnik.log.10
@@ -86,16 +92,45 @@
 distribution-ci/logs/wordnik.log.7
 distribution-ci/logs/wordnik.log.8
 distribution-ci/logs/wordnik.log.9
-vagrant-asdc-all-in-one/
-catalog-ui/tests/Coverage/*
-catalog-ui/Chrome*
-catalog-ui/PhantomJS_1.9.8_(Windows_7_0.0.0)/*
-
-.metadata/
-bin/
-Vagrantfile
-sdnc-tests/test-output/*
+dox-sequence-diagram-ui/node/*
+log.home_IS_UNDEFINED/ASDC/ASDC-BE/Error.log
+log.home_IS_UNDEFINED/ASDC/ASDC-BE/audit.log
+log.home_IS_UNDEFINED/ASDC/ASDC-BE/debug.log
+log.home_IS_UNDEFINED/ASDC/ASDC-BE/debug_by_package.log
+log.home_IS_UNDEFINED/ASDC/ASDC-BE/transaction.log
+log/
+node/*
+openecomp-be/tools/swagger-ui/api-docs/api.html
+openecomp-be/tools/swagger-ui/api-docs/api.json
+openecomp-ui/node/*
+sdc-os-chef/.idea/*
+sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties
+sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml
+sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml
+sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
+sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default/normatives.tar.gz
+sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
+sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default
+sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC-*.zip
+sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/sdctool.tar
+sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/*
+sdc-os-chef/sdc-normatives/chef-repo/cookbooks/sdc-normatives/files/default/normatives.tar.gz
+sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/*
 sdnc-tests-new-frame-work/test-output/*
+sdnc-tests-new-frame-work/test-output/**
+sdnc-tests/logs/wordnik.log
+sdnc-tests/test-output/*
+target/
+test-apis-ci/ExtentReport/*
+test-apis-ci/ExtentReport/ASDC_CI_Extent_Report.html
+test-apis-ci/extent.html
+test-apis-ci/logfile.log*
+test-apis-ci/test-output/*
+ui-ci/.tern-project
+ui-ci/ExtentReport/*
+ui-ci/logfile.log*
+ui-ci/src/main/resources/Files/output/*
+ui-ci/src/main/resources/Files/outputMainServiceTemplate/*
 ui-ci/test-output/*
 ui-ci/test-output/Default suite/Default test.html
 ui-ci/test-output/Default suite/Default test.xml
@@ -103,71 +138,12 @@
 ui-ci/test-output/emailable-report.html
 ui-ci/test-output/index.html
 ui-ci/test-output/old/Default suite/classes.html
-ui-ci/test-output/old/Default suite/methods.html
 ui-ci/test-output/old/Default suite/methods-alphabetical.html
+ui-ci/test-output/old/Default suite/methods.html
 ui-ci/test-output/old/Default suite/testng.xml.html
 ui-ci/test-output/old/Default suite/toc.html
 ui-ci/test-output/old/index.html
 ui-ci/test-output/testng-failed.xml
 ui-ci/test-output/testng-results.xml
-ui-ci/src/main/resources/Files/outputMainServiceTemplate/*
-ui-ci/src/main/resources/Files/output/*
-
-sdnc-tests-new-frame-work/test-output/**
-asdc-tests/test-output/**
-
-asdc-chef/cookbooks/Deploy-SDandC/attributes/version.rb
-asdc-tests/ExtentReport/ASDC_CI_Extent_Report.html
-*.orig
-test-apis-ci/ExtentReport/*
-test-apis-ci/test-output/*
-test-apis-ci/test-output/*
-test-apis-ci/ExtentReport/*
-ui-ci/ExtentReport/*
-test-apis-ci/test-output/*
-test-apis-ci/ExtentReport/ASDC_CI_Extent_Report.html
-test-apis-ci/extent.html
-sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default/normatives.tar.gz
-sdc-os-chef/sdc-normatives/chef-repo/cookbooks/sdc-normatives/files/default/normatives.tar.gz
-catalog-be/test-output/*
-test-apis-ci/logfile.log*
-ui-ci/logfile.log*
-catalog-ui/node/*
-log.home_IS_UNDEFINED/ASDC/ASDC-BE/audit.log
-log.home_IS_UNDEFINED/ASDC/ASDC-BE/debug.log
-log.home_IS_UNDEFINED/ASDC/ASDC-BE/debug_by_package.log
-log.home_IS_UNDEFINED/ASDC/ASDC-BE/Error.log
-log.home_IS_UNDEFINED/ASDC/ASDC-BE/transaction.log
-openecomp-be/tools/swagger-ui/api-docs/api.html
-openecomp-be/tools/swagger-ui/api-docs/api.json
-dox-sequence-diagram-ui/node/*
-openecomp-ui/node/*
-sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC-*.zip
-sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/sdctool.tar
-sdc-os-chef/.idea/*
-node/*
-
-# chef
-.delivery
-
-common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/logs/*
-
-/asdctool/tosca/*
-
-/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties
-/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml
-/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml
-/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
-
-/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml
-sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/*
-
-/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
-
-
-/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml
-
-/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/*
-/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
-
-/catalog-be/.pydevproject
+utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml
+vagrant-asdc-all-in-one/
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index dd38726..7c6d8bf 100644
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -4,16 +4,20 @@
 
 COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
 
-ADD onboarding-be-*.war        ${JETTY_BASE}/webapps/
+ADD onboarding-be-*.war    ${JETTY_BASE}/webapps/
 
-ADD catalog-be-*.war           ${JETTY_BASE}/webapps/
+ADD catalog-be-*.war       ${JETTY_BASE}/webapps/
 
-ADD api-docs.war	       ${JETTY_BASE}/webapps/
+ADD api-docs.war           ${JETTY_BASE}/webapps/
 
-RUN chown -R jetty:jetty       ${JETTY_BASE}/webapps
+USER root
+
+RUN chown -R jetty:jetty   ${JETTY_BASE}/webapps
 
 COPY startup.sh /root/
 
 RUN chmod 770 /root/startup.sh
 
+USER jetty
+
 ENTRYPOINT [ "/root/startup.sh" ]
diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index 7f9207d..91980cc 100644
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -10,10 +10,14 @@
 
 ADD catalog-fe-*.war        ${JETTY_BASE}/webapps/
 
+USER root
+
 RUN chown -R jetty:jetty    ${JETTY_BASE}/webapps
 
 COPY startup.sh /root/
 
 RUN chmod 770 /root/startup.sh
 
+USER jetty
+
 ENTRYPOINT [ "/root/startup.sh" ]