diff --git a/full/pom.xml b/full/pom.xml
index 8efeb30..3193ee4 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -107,7 +107,7 @@
 							<goal>shade</goal>
 						</goals>
 						<configuration>
-							<finalName>Kustvakt-${project.version}-full</finalName>
+							<finalName>Kustvakt-full-${project.version}</finalName>
 							<transformers>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
diff --git a/full/src/main/resources/default-config.xml b/full/src/main/resources/default-config.xml
index 33e19a7..903521c 100644
--- a/full/src/main/resources/default-config.xml
+++ b/full/src/main/resources/default-config.xml
@@ -42,8 +42,8 @@
 		<property name="locations">
 			<array>
 				<value>classpath:jdbc.properties</value>
+				<value>file:./jdbc.properties</value>
 				<value>classpath:hibernate.properties</value>
-				<!-- <value>file:./jdbc.properties</value> -->
 				<value>classpath:kustvakt.conf</value>
 				<value>file:./kustvakt.conf</value>
 			</array>
@@ -101,7 +101,7 @@
 		<!-- <property name="validateOnMigrate" value="false" /> -->
 		<!-- <property name="cleanOnValidationError" value="true" /> -->
 		<property name="locations" value="${jdbc.schemaPath}" />
-		<property name="dataSource" ref="sqliteDataSource" />
+		<property name="dataSource" ref="dataSource" />
 	</bean>
 	
 	
@@ -285,9 +285,4 @@
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 	
-	<!-- Krill -->
-	<bean id="search_krill"
-          class="de.ids_mannheim.korap.web.SearchKrill">
-        <constructor-arg value="${krill.indexDir}"/>
-    </bean>
 </beans>
\ No newline at end of file
diff --git a/full/src/main/resources/jdbc.properties b/full/src/main/resources/jdbc.properties
index 94047d1..8cd88d0 100644
--- a/full/src/main/resources/jdbc.properties
+++ b/full/src/main/resources/jdbc.properties
@@ -2,21 +2,21 @@
 # MySQL Settings
 # todo: test user and password in classpath file
 
-#jdbc.database=mysql
-#jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://localhost:3306/kustvakt?autoReconnect=true
-#jdbc.username=korap
-#jdbc.password=password
-#jdbc.schemaPath=db.mysql
+jdbc.database=mysql
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/kustvakt?autoReconnect=true
+jdbc.username=korap
+jdbc.password=password
+jdbc.schemaPath=db.new-mysql
 
 
 #-------------------------------------------------------------------------------
 # Sqlite Settings
 
-jdbc.database=sqlite
-jdbc.driverClassName=org.sqlite.JDBC
-jdbc.url=jdbc:sqlite:db.sqlite
-# jdbc.url=jdbc:sqlite:kustvakt_init_test.sqlite
-jdbc.username=pc
-jdbc.password=pc
-jdbc.schemaPath=classpath:db.sqlite
+#jdbc.database=sqlite
+#jdbc.driverClassName=org.sqlite.JDBC
+#jdbc.url=jdbc:sqlite:db.sqlite
+## jdbc.url=jdbc:sqlite:kustvakt_init_test.sqlite
+#jdbc.username=pc
+#jdbc.password=pc
+#jdbc.schemaPath=classpath:db.sqlite