diff --git a/Dockerfile b/Dockerfile
index 71d0f77..20f7944 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,11 @@
 # Bump for rebuild on 07/01/2024 18:17 UTC +3
 FROM debian:sid
 RUN apt update
-RUN apt install -y wget curl vim sudo systemd ifupdown rsyslog logrotate less bash-completion ca-certificates netbase lsb-release apt-utils gnupg2 apt-transport-https debian-keyring debian-archive-keyring
+RUN apt install -y wget curl vim sudo systemd ifupdown rsyslog logrotate less bash-completion ca-certificates netbase lsb-release apt-utils gnupg2 apt-transport-https debian-keyring debian-archive-keyring software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cmake cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make rpm2cpio
 RUN wget https://github.com/CosmicFusion/debian-bleedingedge/raw/main/setup.sh
 RUN chmod +x ./setup.sh
 RUN ./setup.sh
 RUN apt update
 RUN apt full-upgrade -y
+RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
diff --git a/setup.sh b/setup.sh
index 8a3f348..17665cb 100644
--- a/setup.sh
+++ b/setup.sh
@@ -3,32 +3,33 @@
 mkdir -p /etc/apt/sources.list.d
 
 # Clear /etc/apt/sources.list in favor of deb822 formats
-tee /etc/apt/sources.list.d/system.sources <<'EOF'
+tee /etc/apt/sources.list <<'EOF'
 ## This file is deprecated in PikaOS.
 ## See /etc/apt/sources.list.d/system.sources.
 EOF
 
-# Add Debian Repos
-tee /etc/apt/sources.list.d/system.sources <<'EOF'
-X-Repolib-Name: Debian System Sources
+# Add Debian Repo
+touch /etc/apt/sources.list.d/debian.sources
+tee /etc/apt/sources.list.d/debian.sources <<'EOF'
+X-Repolib-Name: Debian Sources
 Enabled: yes
 Types: deb deb-src
 URIs: http://deb.debian.org/debian
 Suites: sid experimental
 Components: main contrib non-free non-free-firmware
-X-Repolib-ID: system
 X-Repolib-Default-Mirror: http://deb.debian.org/debian
 Signed-by: /usr/share/keyrings/debian-archive-keyring.gpg
 EOF
 
 # Add Pika Repos
-tee /etc/apt/sources.list.d/pika.sources <<'EOF'
-X-Repolib-Name: PikaOS Sources
+tee /etc/apt/sources.list.d/system.sources <<'EOF'
+X-Repolib-Name: PikaOS System Sources
 Enabled: yes
 Types: deb
 URIs: https://ppa.pika-os.com/
 Suites: pikauwu
 Components: main amdgpu rocm
+X-Repolib-ID: system
 X-Repolib-Default-Mirror: https://ppa.pika-os.com/
 Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
 EOF