diff --git a/extras/pandora_gotty/Dockerfile b/extras/pandora_gotty/Dockerfile-RPM
similarity index 100%
rename from extras/pandora_gotty/Dockerfile
rename to extras/pandora_gotty/Dockerfile-RPM
diff --git a/extras/pandora_gotty/build_all_docker.sh b/extras/pandora_gotty/build_all_docker.sh
new file mode 100755
index 0000000000..e4da1a7558
--- /dev/null
+++ b/extras/pandora_gotty/build_all_docker.sh
@@ -0,0 +1,3 @@
+#Build RPM
+docker build -t pandora_gotty_builder -f Dockerfile-RPM .
+docker run --rm -it -v `pwd`:/root/pandora_gotty pandora_gotty_builder /root/pandora_gotty/build_rpm.sh
\ No newline at end of file
diff --git a/extras/pandora_gotty/build_docker.sh b/extras/pandora_gotty/build_docker.sh
deleted file mode 100755
index cc2c81caa3..0000000000
--- a/extras/pandora_gotty/build_docker.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-docker build -t pandora_gotty_builder .
-docker run --rm -it -v `pwd`:/root/pandora_gotty pandora_gotty_builder /root/pandora_gotty/build.sh
\ No newline at end of file
diff --git a/extras/pandora_gotty/build.sh b/extras/pandora_gotty/build_rpm.sh
similarity index 98%
rename from extras/pandora_gotty/build.sh
rename to extras/pandora_gotty/build_rpm.sh
index e3be2587ca..f257f6ae57 100755
--- a/extras/pandora_gotty/build.sh
+++ b/extras/pandora_gotty/build_rpm.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#RPM
 VERSION=$(grep '%define version' pandora_gotty.spec | awk '{print $3}')
 mkdir -p pandora_gotty-${VERSION} 
 cp src/* pandora_gotty-${VERSION}/
@@ -10,3 +10,4 @@ rpmbuild -ba pandora_gotty.spec
 rm -rf pandora_gotty-${VERSION}
 mv ${HOME}/rpmbuild/RPMS/x86_64/pandora_gotty* .
 
+#DEB
\ No newline at end of file
diff --git a/extras/pandora_gotty/pandora_gotty.spec b/extras/pandora_gotty/pandora_gotty.spec
index 5b0bde5d8e..005dfd945f 100644
--- a/extras/pandora_gotty/pandora_gotty.spec
+++ b/extras/pandora_gotty/pandora_gotty.spec
@@ -25,15 +25,13 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p %{buildroot}/etc/pandora_gotty/
 cp %{name} $RPM_BUILD_ROOT/%{_bindir}
-cp pandora_gotty_ssh.conf %{buildroot}/etc/pandora_gotty/
-cp pandora_gotty_telnet.conf %{buildroot}/etc/pandora_gotty/
+cp pandora_gotty.conf %{buildroot}/etc/pandora_gotty/
 %clean
 rm -Rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%config(noreplace) /etc/pandora_gotty/pandora_gotty_ssh.conf
-%config(noreplace) /etc/pandora_gotty/pandora_gotty_telnet.conf
+%config(noreplace) /etc/pandora_gotty/pandora_gotty.conf
 %{_bindir}/%{name}
 
 %changelog
diff --git a/extras/pandora_gotty/src/pandora_gotty.conf b/extras/pandora_gotty/src/pandora_gotty.conf
new file mode 100644
index 0000000000..01a037dd72
--- /dev/null
+++ b/extras/pandora_gotty/src/pandora_gotty.conf
@@ -0,0 +1,36 @@
+//Pandora Gotty
+
+// [bool] Permit clients to write to the TTY
+permit_write = true
+
+// [bool] Enable basic authentication
+enable_basic_auth = true
+
+// [string] Default username and password of basic authentication (user:pass)
+//          To enable basic authentication, set `true` to `enable_basic_auth`
+credential = "pandora:Pandor4!"
+
+// [bool] Permit clients to send command line arguments in URL (e.g. http://example.com:8080/?arg=AAA&arg=BBB)
+permit_arguments = true
+
+// [bool] Enable random URL generation
+enable_random_url = true
+
+// [int] Default length of random strings appended to URL
+//       To enable random URL generation, set `true` to `enable_random_url`
+random_url_length = 32
+
+// [bool] Enable TLS/SSL
+// enable_tls = false
+
+// [string] Default TLS certificate file path
+// tls_crt_file = "~/.gotty.crt"
+
+// [string] Default TLS key file path
+// tls_key_file = "~/.gotty.key"
+
+// [bool] Enable client certificate authentication
+// enable_tls_client_auth = false
+
+// [string] Certificate file of CA for client certificates
+// tls_ca_crt_file = "~/.gotty.ca.crt"
\ No newline at end of file
diff --git a/extras/pandora_gotty/src/pandora_gotty_ssh.conf b/extras/pandora_gotty/src/pandora_gotty_ssh.conf
deleted file mode 100644
index b00ca51e4b..0000000000
--- a/extras/pandora_gotty/src/pandora_gotty_ssh.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#to be fill
-lkdslkds
-sdjkfhasjdf
-kdsjfslkjdhfa
\ No newline at end of file
diff --git a/extras/pandora_gotty/src/pandora_gotty_telnet.conf b/extras/pandora_gotty/src/pandora_gotty_telnet.conf
deleted file mode 100644
index 9aac8c73d0..0000000000
--- a/extras/pandora_gotty/src/pandora_gotty_telnet.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#to be fill
-dlksdlkfjs
-sldjfslkjdf
-kjdfhksjhdkjlfsh
\ No newline at end of file