diff --git a/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java
index d5f7693..401f31b 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java
@@ -38,7 +38,7 @@ public class UserDAO {
         return namedParameterJdbcTemplate.query( SELECT_BY_USERNAME, params, new UserRowMapper() )
                 .stream()
                 .findAny()
-                .orElse( new User() );
+                .orElse( null );
     }
 
     public List<User> findAll() {
diff --git a/src/main/java/com/utopiaindustries/service/BarcodeService.java b/src/main/java/com/utopiaindustries/service/BarcodeService.java
index 05b1cba..27a52a0 100644
--- a/src/main/java/com/utopiaindustries/service/BarcodeService.java
+++ b/src/main/java/com/utopiaindustries/service/BarcodeService.java
@@ -13,6 +13,7 @@ import com.zebra.sdk.comm.TcpConnection;
 import com.zebra.sdk.graphics.internal.ZebraImage;
 import com.zebra.sdk.printer.ZebraPrinter;
 import com.zebra.sdk.printer.ZebraPrinterFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.imageio.ImageIO;
@@ -27,6 +28,12 @@ import java.util.List;
 @Service
 public class BarcodeService {
 
+    @Value("${ctp.printer.ipAdd}")
+    private String ipAddress;
+
+    @Value("${ctp.printer.port}")
+    private int port;
+
     private final BundleDAO bundleDAO;
     private final MasterBundleDAO masterBundleDAO;
     private final FinishedItemDAO finishedItemDAO;
@@ -123,9 +130,7 @@ public class BarcodeService {
     }
 
     public void printLabel( BufferedImage bufferedImage ) throws Exception {
-        String ipAddr = "172.16.53.32";
-        int port = 9100;
-        Connection connection = new TcpConnection( ipAddr, port );
+        Connection connection = new TcpConnection( ipAddress, port );
         connection.open();
         ZebraPrinter printer = ZebraPrinterFactory.getInstance( connection );
         ZebraImage zebraImage = new ZebraImage( bufferedImage );
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f737fe4..9c396ee 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,20 +1,4 @@
 spring:
-  resources:
-    chain:
-      cache: false
-      strategy:
-        content:
-          enabled: true
-          paths: /**
-      html-application-cache: true
-      enabled: true
-    cache:
-      period: 0
-    static-locations: classpath:/static/
-  thymeleaf:
-    check-template-location: true
-    cache: false
-    prefix: classpath:/templates/
   uinddatasource:
     jdbcUrl: jdbc:mysql://192.168.90.147:3306
     username: utopia
@@ -44,23 +28,7 @@ spring:
       pool-name: CTPPool
       leak-detection-threshold: 2000
 
-server:
-  servlet:
-    context-path: /ctp
-  tomcat:
-    remoteip:
-      remote-ip-header: X-FORWARDED-FOR
-    max-parameter-count: 50000
-  port: 8080
-  compression:
-    enabled: true
-    mime-types: text/html, text/xml, text/plain, text/css, text/javascript, application/javascript, application/json, application/xml
-    min-response-size: 2KB
-
-thymeleaf-layout-dialect:
-  version: 2.1.1
-
 ctp:
-  cipher:
-    key: BC87A69BFCEC4A71E73B8DCCC4F14
-    seed-value : 7XYXo8Qq6D
\ No newline at end of file
+  printer:
+    ipAdd: 192.168.90.160
+    port: 9100
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 2e50966..2607c37 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,20 +1,4 @@
 spring:
-  resources:
-    chain:
-      cache: false
-      strategy:
-        content:
-          enabled: true
-          paths: /**
-      html-application-cache: true
-      enabled: true
-    cache:
-      period: 0
-    static-locations: classpath:/static/
-  thymeleaf:
-    check-template-location: true
-    cache: false
-    prefix: classpath:/templates/
   uinddatasource:
     jdbcUrl: jdbc:mysql://localhost:3306
     username: root
@@ -44,23 +28,7 @@ spring:
       pool-name: CTPPool
       leak-detection-threshold: 2000
 
-server:
-  servlet:
-    context-path: /ctp
-  tomcat:
-    remoteip:
-      remote-ip-header: X-FORWARDED-FOR
-    max-parameter-count: 50000
-  port: 8080
-  compression:
-    enabled: true
-    mime-types: text/html, text/xml, text/plain, text/css, text/javascript, application/javascript, application/json, application/xml
-    min-response-size: 2KB
-
-thymeleaf-layout-dialect:
-  version: 2.1.1
-
 ctp:
-  cipher:
-    key: BC87A69BFCEC4A71E73B8DCCC4F14
-    seed-value : 7XYXo8Qq6D
\ No newline at end of file
+  printer:
+    ipAdd: 172.16.53.32
+    port: 9100
\ No newline at end of file
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index b472387..48d0837 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -6,3 +6,41 @@ application:
 spring:
   profiles:
     active: dev
+
+  resources:
+    chain:
+      cache: false
+      strategy:
+        content:
+          enabled: true
+          paths: /**
+      html-application-cache: true
+      enabled: true
+    cache:
+      period: 0
+    static-locations: classpath:/static/
+  thymeleaf:
+    check-template-location: true
+    cache: false
+    prefix: classpath:/templates/
+
+server:
+  servlet:
+    context-path: /ctp
+  tomcat:
+    remoteip:
+      remote-ip-header: X-FORWARDED-FOR
+    max-parameter-count: 50000
+  port: 8080
+  compression:
+    enabled: true
+    mime-types: text/html, text/xml, text/plain, text/css, text/javascript, application/javascript, application/json, application/xml
+    min-response-size: 2KB
+
+thymeleaf-layout-dialect:
+  version: 2.1.1
+
+ctp:
+  cipher:
+    key: BC87A69BFCEC4A71E73B8DCCC4F14
+    seed-value : 7XYXo8Qq6D
\ No newline at end of file