diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle
index 5e44b61c..05c22ccb 100644
--- a/HIRS_AttestationCAPortal/build.gradle
+++ b/HIRS_AttestationCAPortal/build.gradle
@@ -46,6 +46,7 @@ dependencies {
     implementation 'commons-fileupload:commons-fileupload:1.5'
     implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
     implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-jasper:10.1.5'
 
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
@@ -56,13 +57,13 @@ dependencies {
     testImplementation libs.testng
 }
 
-war {
-    from(buildDir) {
-        include 'VERSION'
-        into 'WEB-INF/classes'
-    }
-    archiveFileName = 'HIRS_AttestationCAPortal.war'
-}
+//war {
+//    from(buildDir) {
+//        include 'VERSION'
+//        into 'WEB-INF/classes'
+//    }
+//    archiveFileName = 'HIRS_AttestationCAPortal.war'
+//}
 
 ospackage {
     packageName = 'HIRS_AttestationCA'
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java
index ae04c9e9..5c587d66 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java
@@ -15,26 +15,27 @@ import org.springframework.web.servlet.DispatcherServlet;
 import java.util.Collections;
 
 @SpringBootApplication
-@EnableAutoConfiguration
-@Log4j2
-public class HIRSApplication extends SpringBootServletInitializer {
+//@EnableAutoConfiguration
+//@Log4j2
+public class HIRSApplication {//extends SpringBootServletInitializer {
 
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(HIRSApplication.class);
-    }
+//    @Override
+//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+//        return application.sources(HIRSApplication.class);
+//    }
 
-    @Override
-    public void onStartup(ServletContext servletContext) throws ServletException {
-        ServletRegistration.Dynamic appServlet = servletContext.addServlet("mvc", new DispatcherServlet(
-                new GenericWebApplicationContext()));
+//    @Override
+//    public void onStartup(ServletContext servletContext) throws ServletException {
+//        ServletRegistration.Dynamic appServlet = servletContext.addServlet("mvc", new DispatcherServlet(
+//                new GenericWebApplicationContext()));
 
-        appServlet.setLoadOnStartup(1);
-    }
+//        appServlet.setLoadOnStartup(1);
+//    }
 
     public static void main(String[] args) {
-        SpringApplication springApplication = new SpringApplication(HIRSApplication.class);
-        springApplication.setDefaultProperties(Collections.singletonMap("server.servlet.context-path", "/portal"));
-        springApplication.run(args);
+//        SpringApplication springApplication = new SpringApplication(HIRSApplication.class);
+//        springApplication.setDefaultProperties(Collections.singletonMap("server.servlet.context-path", "/portal"));
+//        springApplication.run(args);
+        SpringApplication.run(HIRSApplication.class, args);
     }
-}
\ No newline at end of file
+}
diff --git a/HIRS_AttestationCAPortal/src/main/resources/application.properties b/HIRS_AttestationCAPortal/src/main/resources/application.properties
index 6da0b806..959a978d 100644
--- a/HIRS_AttestationCAPortal/src/main/resources/application.properties
+++ b/HIRS_AttestationCAPortal/src/main/resources/application.properties
@@ -1,9 +1,10 @@
 
-server.error.path=/error
-spring.mvc.view.prefix=/WEB-INF/jsp/
-spring.mvc.view.suffix=.jsp
+#server.error.path=/error
+#spring.mvc.view.prefix=/WEB-INF/jsp/
+#spring.mvc.view.suffix=.jsp
 
 logging.level.org.springframework=INFO
+logging.level.org.apache.catalina=DEBUG
 spring.jpa.hibernate.ddl-auto=update
 spring.datasource.url=jdbc:mariadb://localhost:3306/hirs_db?autoReconnect=true&useSSL=false
 spring.datasource.username=hirs_db
@@ -21,10 +22,14 @@ server.tomcat.accesslog.prefix=access_log
 server.tomcat.accesslog.suffix=.log
 server.tomcat.accesslog.rotate=true
 
+server.tomcat.basedir=/opt/embeddedtomcat
+server.servlet.register-default-servlet=true
+server.servlet.context-path=/HIRS_AttestationCAPortal/portal
+
 #jdbc.driverClassName = com.mysql.cj.jdbc.Driver
 #jdbc.url = jdbc:mysql://localhost:3306/hirs_db?autoReconnect=true&useSSL=false
 #jdbc.username = root
 #jdbc.password = hirspass
 #entitymanager.packagesToScan: hirs.attestationca.portal.page.controllers
 #spring.jpa.hibernate.ddl-auto=update
-#spring.jpa.show-sql=true
\ No newline at end of file
+#spring.jpa.show-sql=true
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag
index bacdde8e..6e090d44 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag
@@ -13,7 +13,7 @@
 <c:set var="icons" value="${images}/icons" scope="session" />
 <c:set var="common" value="${baseURL}/common" scope="session" />
 <c:set var="lib" value="${baseURL}/lib" scope="session" />
-<c:set var="portal" value="${baseURL}/portal" scope="session" />
+<c:set var="portal" value="${baseURL}" scope="session" />
 <c:set var="pagePath" value="${portal}/${page.prefixPath}${page.viewName}" scope="session" />
 <c:set var="certificateRequest" value="${portal}/certificate-request" scope="session" />