diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfc76684..bc424e8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,7 +138,7 @@ GMW_TK:staging:
  rules:
    - if: '$CI_COMMIT_BRANCH == "develop"'
  variables:
-   APP_NAME: GMW
+   APP_NAME: GMW_TK
    PROJ_NAME: GMW
    NEXUS_PATH: GMW
  before_script:
@@ -147,7 +147,7 @@ GMW_TK:staging:
    - *version-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_TK.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GMW/GMW.csproj'
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_test /p:PublishProfile=TK_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMW.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_test /p:PublishProfile=TK_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["GMW:build"]
@@ -159,7 +159,7 @@ GMW_SP:staging:
  rules:
    - if: '$CI_COMMIT_BRANCH == "develop"'
  variables:
-   APP_NAME: GMW
+   APP_NAME: GMW_SP
    PROJ_NAME: GMW
    NEXUS_PATH: GMW
  before_script:
@@ -168,7 +168,7 @@ GMW_SP:staging:
    - *version-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_SP.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GMW/GMW.csproj'
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_test /p:PublishProfile=SP_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMW.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_test /p:PublishProfile=SP_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["GMW:build"]
@@ -180,7 +180,7 @@ TERM_TK:staging:
  rules:
    - if: '$CI_COMMIT_BRANCH == "develop"'
  variables:
-   APP_NAME: GMWT
+   APP_NAME: GMWT_TK
    PROJ_NAME: GMW_Term
    NEXUS_PATH: GMWT
  before_script:
@@ -189,7 +189,7 @@ TERM_TK:staging:
    - *version-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_TK.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GMW_Term/GMW_Term.csproj'
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_test /p:PublishProfile=TK_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMWT.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_test /p:PublishProfile=TK_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["TERM:build"]
@@ -201,7 +201,7 @@ TERM_SP:staging:
  rules:
    - if: '$CI_COMMIT_BRANCH == "develop"'
  variables:
-   APP_NAME: GMWT
+   APP_NAME: GMWT_SP
    PROJ_NAME: GMW_Term
    NEXUS_PATH: GMWT
  before_script:
@@ -210,7 +210,7 @@ TERM_SP:staging:
    - *version-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_SP.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GMW_Term/GMW_Term.csproj'
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_test /p:PublishProfile=SP_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMWT.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_test /p:PublishProfile=SP_test.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["TERM:build"]
@@ -294,7 +294,7 @@ GMW_TK:install:
  rules:
    - if: '$CI_COMMIT_BRANCH == "master"'
  variables:
-   APP_NAME: GMW
+   APP_NAME: GMW_TK
    PROJ_NAME: GMW
    NEXUS_PATH: GMW
  before_script:
@@ -302,7 +302,7 @@ GMW_TK:install:
    - '& "$env:NUGET_PATH" restore GMW.sln -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_prod /p:PublishProfile=TK_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMW.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_prod /p:PublishProfile=TK_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["GMW:build"]
@@ -314,7 +314,7 @@ GMW_SP:install:
  rules:
    - if: '$CI_COMMIT_BRANCH == "master"'
  variables:
-   APP_NAME: GMW
+   APP_NAME: GMW_SP
    PROJ_NAME: GMW
    NEXUS_PATH: GMW
  before_script:
@@ -322,7 +322,7 @@ GMW_SP:install:
    - '& "$env:NUGET_PATH" restore GMW.sln -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_prod /p:PublishProfile=SP_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMW.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_prod /p:PublishProfile=SP_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMW" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["GMW:build"]
@@ -334,7 +334,7 @@ TERM_TK:install:
  rules:
    - if: '$CI_COMMIT_BRANCH == "master"'
  variables:
-   APP_NAME: GMWT
+   APP_NAME: GMWT_TK
    PROJ_NAME: GMW_Term
    NEXUS_PATH: GMWT
  before_script:
@@ -342,7 +342,7 @@ TERM_TK:install:
    - '& "$env:NUGET_PATH" restore GMW_Terminus.sln -verbosity quiet' 
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_prod /p:PublishProfile=TK_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMWT.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=TK_prod /p:PublishProfile=TK_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["TERM:build"]
@@ -354,7 +354,7 @@ TERM_SP:install:
  rules:
    - if: '$CI_COMMIT_BRANCH == "master"'
  variables:
-   APP_NAME: GMWT
+   APP_NAME: GMWT_SP
    PROJ_NAME: GMW_Term
    NEXUS_PATH: GMWT
  before_script:
@@ -362,7 +362,7 @@ TERM_SP:install:
    - '& "$env:NUGET_PATH" restore GMW_Terminus.sln -verbosity quiet' 
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_prod /p:PublishProfile=SP_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/GMWT.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SP_prod /p:PublishProfile=SP_prod.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/GMWT" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW_Term/GMW_Term.csproj'
    - *hashBuild
    - *nexusUpload
  needs: ["TERM:build"]