diff --git a/Dockerfile b/Dockerfile
index a68dade..14938e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:latest
+FROM python:3
 
 RUN apt update -y && apt install -y make
 RUN apt install -y git
 RUN apt install -y gcc
 RUN gcc --version
 RUN apt install -y build-essential
+RUN apt install -y moreutils
+RUN python --version
 RUN git clone https://github.com/usnistgov/SCTK.git
 WORKDIR SCTK
 RUN make config && make all && make check &&  make install && make doc
 ENV PATH=$PATH:/SCTK/bin
-RUN apt-get update && apt-get install -y python3
-RUN apt-get update && apt-get install -y python3-pip
-RUN pip3 install matplotlib
\ No newline at end of file
+RUN pip install matplotlib
\ No newline at end of file
diff --git a/JenkinsfilePlots b/JenkinsfilePlots
index 67c7c84..03027cb 100644
--- a/JenkinsfilePlots
+++ b/JenkinsfilePlots
@@ -18,10 +18,8 @@ pipeline {
       stage('Plots')
       {
          steps {
-            sh label: '', script: 'chmod a+rwx ./wykres.py'
-			sh label: '', script: './wykres.py'
-			archiveArtifacts 'wer.png'
-			archiveArtifacts 'srr.png'
+             sh label: 'WER plot', script: './wykres.py wer.txt wer.png'
+             sh label: 'SRR plot', script: './wykres.py srr.txt srr.png'
          }
       }
       stage('ArchiveArtifacts')
diff --git a/wykres.py b/wykres.py
index 11993b1..eb33738 100644
--- a/wykres.py
+++ b/wykres.py
@@ -1,26 +1,37 @@
+#!/usr/bin/env python
 import matplotlib.pyplot as plt
+import sys
 
-fig_wer, ax_wer = plt.subplots()
-fig_srr, ax_srr = plt.subplots()
 
-X1, Y1 = [], []
-X2, Y2 = [], []
-y_num = 1
-for line in open('wer.txt', 'r'):
-    Y1.append(float(line[:-1]))
-    X1.append(y_num)
-    y_num = y_num + 1
+def read_file(filename):
+    values = []
+    with open(filename) as f:
+        for line in f:
+            values.append(float(line.rstrip('\n')))
+    return values
 
-ax_wer.plot(X1, Y1)
-ax_wer.set_title("WER")
-fig_wer.savefig('wer.png')
 
-y_num = 1
-for line in open('srr.txt', 'r'):
-    Y2.append(float(line[:-1]))
-    X2.append(y_num)
-    y_num = y_num + 1
+def main():
+    input_file = sys.argv[1]
+    output_file = sys.argv[2]
 
-ax_srr.plot(X2, Y2)
-ax_srr.set_title("SRR")
-fig_srr.savefig('srr.png')
+    # Get values
+    values = read_file(input_file)
+
+    # Setup values
+    plt.plot(values)
+
+    # Set x-label to 'executes'
+    plt.xlabel('executes')
+
+    # Set y-label to 'executes'
+    ylabel_name = input_file.split('.')[0]
+    plt.ylabel(ylabel_name)
+
+    # Save fig with 800 dpi
+    plt.savefig(output_file, dpi=800)
+    plt.close()
+
+
+if __name__ == "__main__":
+    main()